',
' ' + l('editRepeatingItem') + '
',
' ',
@@ -214,7 +216,7 @@
$rootScope.$emit('calendars:list');
}).finally(function() {
$timeout(function() {
- Component.$ghost = {};
+ Component.$resetGhost();
});
});
}
@@ -226,13 +228,58 @@
RecurrentComponentDialogController.$inject = ['$scope', '$mdDialog', 'component', 'params'];
function RecurrentComponentDialogController($scope, $mdDialog, component, params) {
$scope.updateThisOccurrence = function() {
- component.$adjust(params).then($mdDialog.hide, $mdDialog.cancel);
+ component.$adjust(params).then($mdDialog.hide, function(response) {
+ $mdDialog.cancel().then(function() {
+ onComponentAdjustError(response, component, params);
+ });
+ });
};
$scope.updateAllOccurrences = function() {
delete component.occurrenceId;
- component.$adjust(params).then($mdDialog.hide, $mdDialog.cancel);
+ component.$adjust(params).then($mdDialog.hide, function(response) {
+ $mdDialog.cancel().then(function() {
+ onComponentAdjustError(response, component, params);
+ });
+ });
};
}
+
+ function onComponentAdjustError(response, component, params) {
+ if (response.status == 403 &&
+ response.data && response.data.message && angular.isObject(response.data.message)) {
+ $mdDialog.show({
+ parent: angular.element(document.body),
+ clickOutsideToClose: false,
+ escapeToClose: false,
+ templateUrl: 'UIxAttendeeConflictDialog',
+ controller: AttendeeConflictDialogController,
+ controllerAs: '$AttendeeConflictDialogController',
+ locals: {
+ component: component,
+ params: params,
+ conflictError: response.data.message
+ }
+ }).then(function() {
+ $rootScope.$emit('calendars:list');
+ });
+ }
+ }
+
+ /**
+ * @ngInject
+ */
+ AttendeeConflictDialogController.$inject = ['$scope', '$mdDialog', 'component', 'params', 'conflictError'];
+ function AttendeeConflictDialogController($scope, $mdDialog, component, params, conflictError) {
+ var vm = this;
+
+ vm.conflictError = conflictError;
+ vm.cancel = $mdDialog.cancel;
+ vm.save = save;
+
+ function save() {
+ component.$adjust(angular.extend({ ignoreConflicts: true }, params)).then($mdDialog.hide);
+ }
+ }
}
function filter(filterpopup) {
diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
index 7390fbe84..a6ab49487 100644
--- a/UI/WebServerResources/js/Scheduler/Component.service.js
+++ b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -414,6 +414,15 @@
});
};
+ /**
+ * @function $resetGhost
+ * @desc Prepare the ghost object for the next drag by resetting appropriate attributes
+ */
+ Component.$resetGhost = function() {
+ this.$ghost.pointerHandler = null;
+ this.$ghost.component = null;
+ };
+
/**
* @function $parseDate
* @desc Parse a date string with format YYYY-MM-DDTHH:MM
@@ -1035,8 +1044,9 @@
* @function $save
* @memberof Component.prototype
* @desc Save the component to the server.
+ * @param {object} extraAttributes - additional attributes to send to the server
*/
- Component.prototype.$save = function() {
+ Component.prototype.$save = function(extraAttributes) {
var _this = this, options, path, component, date, dlp;
component = this.$omit();
@@ -1106,6 +1116,8 @@
if (this.occurrenceId)
path.push(this.occurrenceId);
+ angular.extend(component, extraAttributes);
+
return Component.$$resource.save(path.join('/'), component, options)
.then(function(data) {
// Make a copy of the data for an eventual reset
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 3bc62fdfd..e5ab49775 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -162,6 +162,7 @@
vm.addAttachUrl = addAttachUrl;
vm.cancel = cancel;
vm.save = save;
+ vm.attendeeConflictError = false;
vm.attendeesEditor = {
days: getDays(),
hours: getHours()
@@ -217,15 +218,18 @@
}
}
- function save(form) {
+ function save(form, options) {
if (form.$valid) {
- vm.component.$save()
+ vm.component.$save(options)
.then(function(data) {
$rootScope.$emit('calendars:list');
$mdDialog.hide();
Alarm.getAlarms();
- }, function(data, status) {
- $log.debug('failed');
+ }, function(response) {
+ if (response.status == 403 &&
+ response.data && response.data.message &&
+ angular.isObject(response.data.message))
+ vm.attendeeConflictError = response.data.message;
});
}
}
diff --git a/UI/WebServerResources/scss/components/dialog/dialog.scss b/UI/WebServerResources/scss/components/dialog/dialog.scss
index f03da576a..415393a35 100644
--- a/UI/WebServerResources/scss/components/dialog/dialog.scss
+++ b/UI/WebServerResources/scss/components/dialog/dialog.scss
@@ -19,6 +19,22 @@ body.popup {
}
}
+md-dialog {
+ md-dialog-content {
+ &.sg-dialog-message {
+ // Prepare content to receive a "close" button on the right
+ align-items: flex-start;
+ display: flex;
+ flex-shrink: 0;
+ transition: background-color $swift-ease-in-duration $swift-ease-in-timing-function;
+ &.ng-hide {
+ background-color: white !important;
+ transition-duration: 0s;
+ }
+ }
+ }
+}
+
@media (max-width: $layout-breakpoint-xs) {
md-dialog {
&[flex-xs="100"],