sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed some notification stuff

Browse Source
This commit is contained in:
arzynik 2014-11-12 12:26:59 -08:00
parent 2d6daabe76
commit d9d18be042
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
www/assets/cockpit/js/controllers.tickets.js
View File

@ -77,6 +77,33 @@ NGApp.factory('TicketViewService', function($rootScope, $resource, $routeParams,
service.socket.emit('event.subscribe', 'ticket.' + service.scope.viewTicket);
}
});
$rootScope.$on('userAuth', function(e, data) {
if (!service.socket) {
return;
}
if (AccountService.user && AccountService.user.prefs && AccountService.user.prefs['notification-desktop-support-all'] == '1') {
console.debug('Subscribing to all tickets');
service.socket.emit('event.subscribe', 'ticket.all');
} else {
console.debug('Unsubscribing to all tickets');
service.socket.emit('event.unsubscribe', 'ticket.all');
}
});
$rootScope.$on('user-preference-notification-desktop-support-all', function(e, value) {
if (!service.socket) {
return;
}
if (value == '1') {
console.debug('Subscribing to all tickets');
service.socket.emit('event.subscribe', 'ticket.all');
} else {
console.debug('Unsubscribing to all tickets');
service.socket.emit('event.unsubscribe', 'ticket.all');
}
});
// service.websocket = new WebSocket('wss://' + location.host + ':9000/test?_token=' + $.cookie('token'));
@ -89,8 +116,9 @@ NGApp.factory('TicketViewService', function($rootScope, $resource, $routeParams,
phpsessid: $.cookie('PHPSESSID'),
host: location.host
});
if (AccountService.user.prefs['notification-desktop-support-all'] == '1') {
if (AccountService.user && AccountService.user.prefs && AccountService.user.prefs['notification-desktop-support-all'] == '1') {
console.debug('Subscribing to all tickets');
service.socket.emit('event.subscribe', 'ticket.all');
}
});

4
www/assets/cockpit/js/directives.js
View File

@ -17,7 +17,7 @@ NGApp.directive('chatSend', function(TicketViewService) {
});
NGApp.directive('profilePreference', function (AccountService, $http) {
NGApp.directive('profilePreference', function (AccountService, $http, $rootScope) {
return {
restrict: 'A',
templateUrl: 'assets/view/general-profile-preference.html',
@ -41,6 +41,8 @@ NGApp.directive('profilePreference', function (AccountService, $http) {
AccountService.user.prefs[$scope.key] = value;
$rootScope.$broadcast('user-preference-' + $scope.key, value);
$http({
method: 'POST',
url: App.service + 'config',