amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-19 10:08:12 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix Resource conflict error handling

Browse Source
This commit is contained in:
Francis Lachapelle committed 2016-10-28 11:47:40 -04:00
1 parent f25c26b7bd
commit 5208e46d10
4 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/WebServerResources/js/Scheduler/ComponentController.js
+3 -3
View File
@@ -209,8 +209,8 @@
/**
* @ngInject
*/
ComponentEditorController.$inject = ['$rootScope', '$scope', '$log', '$timeout', '$mdDialog', 'User', 'Calendar', 'Component', 'AddressBook', 'Card', 'Alarm', 'stateComponent'];
function ComponentEditorController($rootScope, $scope, $log, $timeout, $mdDialog, User, Calendar, Component, AddressBook, Card, Alarm, stateComponent) {
ComponentEditorController.$inject = ['$rootScope', '$scope', '$log', '$timeout', '$mdDialog', 'User', 'CalendarSettings', 'Calendar', 'Component', 'AddressBook', 'Card', 'Alarm', 'stateComponent'];
function ComponentEditorController($rootScope, $scope, $log, $timeout, $mdDialog, User, CalendarSettings, Calendar, Component, AddressBook, Card, Alarm, stateComponent) {
var vm = this, component, oldStartDate, oldEndDate, oldDueDate;
vm.service = Calendar;
@@ -306,7 +306,7 @@
$mdDialog.hide();
Alarm.getAlarms();
}, function(response) {
if (response.status == 403 &&
if (response.status == CalendarSettings.ConflictHTTPErrorCode &&
response.data && response.data.message &&
angular.isObject(response.data.message))
vm.attendeeConflictError = response.data.message;