Merge branch 'feature/Cont_WF' into develop

app/app_routes.js

@@ -31,13 +31,16 @@ angular.module('ulakbus')
                 templateUrl: 'components/uitemplates/form_service_pg.html',
                 controller: 'FormServicePg'
             })
-
             // use crud without selected user
             // important: regex urls must be defined later than static ones
             .when('/:wf/', {
                 templateUrl: 'components/crud/templates/crud-preload.html',
                 controller: 'CRUDController'
             })
+            .when('/cwf/:wf/:token', {
+                templateUrl: 'components/crud/templates/crud.html',
+                controller: 'CRUDController'
+            })
             .when('/:wf/do/:cmd', {
                 templateUrl: 'components/crud/templates/crud.html',
                 controller: 'CRUDListFormController'
@@ -58,8 +61,6 @@ angular.module('ulakbus')
                 templateUrl: 'components/crud/templates/crud.html',
                 controller: 'CRUDListFormController'
             })
-
-
             .otherwise({redirectTo: '/dashboard'});
     }])
     .factory('IsOnline', function () {

app/components/crud/crud_controller.js

@@ -68,7 +68,8 @@ angular.module('ulakbus.crud', ['schemaForm', 'ui.bootstrap', 'ulakbus.formServi
                     id: scope.param_id || routeParams.param_id,
                     wf: routeParams.wf,
                     object_id: routeParams.key,
-                    filters: {}
+                    filters: {},
+                    token: routeParams.token
                 };
 
                 if (scope.param_id) {

app/shared/directives.js

@@ -43,7 +43,7 @@ angular.module('ulakbus')
             restrict: 'E',
             replace: true,
             scope: {},
-            controller: function ($scope) {
+            controller: function ($scope, $log) {
                 // notification categories:
                 // 1: tasks, 2: messages, 3: announcements, 4: recents
                 $scope.notifications = {1: [], 2: [], 3: [], 4: []};
@@ -80,6 +80,7 @@ angular.module('ulakbus')
                  * When "notifications" send via websocket, parse notifications by type.
                  */
                 $scope.$on("notifications", function (event, data) {
+                    $log.debug("Notification!", data);
                     $scope.groupNotifications(data);
                 });
 

app/shared/templates/directives/header-notification.html

@@ -38,7 +38,7 @@
         </a>
         <ul class="dropdown-messages" uib-dropdown-menu ng-show="notifications[2].length > 0">
             <li ng-repeat="notify in notifications[2] | limitTo: '8'">
-                <a>
+                <a href="{{notify.url}}">
                     <div ng-click="popModal(notify)">
                         <div>
                             <strong>{{notify.title}}</strong>
@@ -70,7 +70,7 @@
         </a>
         <ul class="dropdown-tasks" uib-dropdown-menu ng-if="notifications[1].length > 0">
             <li ng-repeat="notify in notifications[1] | limitTo: '8'">
-                <a>
+                <a href="{{notify.url}}">
                     <div>
                         <p>
                             <strong>{{notify.title}}</strong>
@@ -106,7 +106,7 @@
         </a>
         <ul class="dropdown-alerts" uib-dropdown-menu ng-if="notifications[3].length > 0">
             <li ng-repeat="notify in notifications[3] | limitTo: '8'">
-                <a role="button">
+                <a role="button" href="{{notify.url}}">
                     <div>
                         <i class="fa fa-comment fa-fw"></i> New Comment
                         <span class="pull-right text-muted small">4 minutes ago</span>