Dev: First draft for all notifications view

LimeSurvey · Aug 2, 2016 · e2b2ae4 · e2b2ae4
1 parent 2e939a0
commit e2b2ae4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/application/controllers/admin/NotificationController.php b/application/controllers/admin/NotificationController.php
@@ -7,17 +7,16 @@ class NotificationController extends Survey_Common_Action
 {
 
     /**
-     * 
+     * List all notifications for a user
      */
-    public function actionIndex()
+    public function index()
     {
-        $aData = array();
-
-        //$this->_renderWrappedTemplate(null, 'super/dummy', $aData);
+        $this->checkPermission();
 
-        //$SCA = Yii::app()->createController('admin.Survey_Common_Action');
-        //$SCA->_renderWrappedTemplate();
+        $data = array();
+        $data['model'] = Notification::model();
 
+        $this->_renderWrappedTemplate(null, array('notification/index'), $data);
     }
 
     /**
@@ -103,7 +102,7 @@ public static function getMenuWidget($surveyId = null) {
         $data['notifications'] = Notification::getNotifications($surveyId);
         $data['zeroNotifications'] = count($data['notifications']) === 0;
         $data['surveyId'] = $surveyId;
-        $data['allNotificationsUrl'] = Yii::app()->createUrl('notification', array());
+        $data['allNotificationsUrl'] = Yii::app()->createUrl('admin/notification', array());
 
         return Yii::app()->getController()->renderPartial(
             '/admin/super/admin_notifications',

diff --git a/application/models/Notification.php b/application/models/Notification.php
@@ -164,8 +164,7 @@ public static function model($className=__CLASS__)
 	}
 
     /**
-     * Get latest notifications
-     *
+     * Get latest notifications to show in the menu
      * @param int|null $surveyId
      * @return Notification[]
      */

diff --git a/application/views/admin/super/admin_notifications.php b/application/views/admin/super/admin_notifications.php
@@ -1,7 +1,8 @@
 <!-- Admin notification system -->
 <?php if ($zeroNotifications): ?>
     <li id='notification-li' class='dropdown'>
-        <a class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded='false' href='#'>
+        <a aria-expanded='false' 
+            href='<?php echo $allNotificationsUrl; ?>'>
             <span class='fa fa-bell text-muted'></span>
         </a>
     </li>