Fixing up message sender

DABSquared · Jun 4, 2013 · 0c0a855 · 0c0a855
1 parent c1896b2
commit 0c0a855
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/Controller/PushAdminController.php b/Controller/PushAdminController.php
@@ -152,7 +152,10 @@ public function getDeviceListAction() {
         $deviceRepository = $em->getRepository('DABSquaredPushBundle:Device');
         $deviceName = $this->get('request')->query->get('term');
 
-        $devices = $deviceRepository->findAllWithStartName($deviceName);
+        /** @var $deviceManager \DABSquared\PushNotificationsBundle\Model\DeviceManager */
+        $deviceManager = $this->get('dab_push_notifications.manager.device');
+
+        $devices = $deviceManager->findDeviceWithName($deviceName);
         if (empty($devices)) {
             $devices = array();
             $aDevice['deviceName'] = 'None';

diff --git a/Entity/DeviceManager.php b/Entity/DeviceManager.php
@@ -119,7 +119,7 @@ public function findDeviceByTypeIdentifierAndAppId($type,$deviceIdentifier, $app
     public function findDeviceWithName($searchTerm) {
         $qb = $this->repository
             ->createQueryBuilder('d')
-            ->where('d.deviceName', 'LIKE', '%$searchTerm%');
+            ->where("d.deviceName LIKE '%$searchTerm%'");
 
         $devices = $qb
             ->getQuery()

diff --git a/Resources/views/messagetype.html.twig b/Resources/views/messagetype.html.twig
@@ -1,5 +1,20 @@
 
 {% block mainContent %}
+<!DOCTYPE html>
+<html xmlns:fb="http://www.facebook.com/2008/fbml">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+</head>
+
+<body>
+
+<div class="container" style="padding-top: 60px;">
+
+
     <form id="pushMessageForm" action="{{ path('create_push_messages') }}" method="post" {{ form_enctype(form) }} autocomplete="off" >
 
         <div class="row" style="text-align:center; width:100%;">
@@ -36,10 +51,15 @@
             </div>
         </div>
 
+        <div class="row" style="text-align:center;">
+            <div class="span12">
+                <input class="btn btn-primary" type="submit" />
 
-        <input class="btn btn-primary" type="submit" />
+            </div>
+        </div>
 
     </form>
+</div>
 
     <script type="text/javascript">
         $(document).ready(function(){
@@ -54,7 +74,7 @@
                             {
                                 url: "{{ path('get_device_list') }}",
                                 data: {
-                                    term: request.term,
+                                    term: request.term
                                 },
                                 type: "GET",  // a jQuery ajax POST transmits in querystring format in utf-8
                                 dataType: "json",   //return data in json format
@@ -101,6 +121,8 @@
 
         });
     </script>
+</body>
+</html>
 
 {% endblock %}