amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-30 15:45:26 +00:00
Code Issues Projects Releases Wiki Activity

Allow rename of calendars

Browse Source
This commit is contained in:
Francis Lachapelle
2015-09-17 10:33:12 -04:00
parent 70bb512bb8
commit 58ff8139e9
4 changed files with 233 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/Calendar.service.js
+137 -74
View File
@@ -121,6 +121,24 @@
return calendar;
};
/**
* @memberof Calendar
* @desc Find a calendar among local instances (personal calendars, subscriptions and Web calendars).
* @param {string} id - the calendar ID
* @returns an object literal of the matching Calendar instance
*/
Calendar.$getIndex = function(id) {
var i;
i = _.indexOf(_.pluck(Calendar.$calendars, 'id'), id);
if (i < 0)
i = _.indexOf(_.pluck(Calendar.$subscriptions, 'id'), id);
if (i < 0)
i = _.indexOf(_.pluck(Calendar.$webcalendars, 'id'), id);
return i;
};
/**
* @memberOf Calendar
* @desc Subscribe to another user's calendar and add it to the list of calendars.
@@ -181,80 +199,6 @@
return d.promise;
};
/**
* @function init
* @memberof Calendar.prototype
* @desc Extend instance with new data and compute additional attributes.
* @param {object} data - attributes of calendar
*/
Calendar.prototype.init = function(data) {
angular.extend(this, data);
// Add 'isOwned' and 'isSubscription' attributes based on active user (TODO: add it server-side?)
this.isOwned = Calendar.activeUser.isSuperUser || this.owner == Calendar.activeUser.login;
this.isSubscription = !this.isRemote && this.owner != Calendar.activeUser.login;
};
/**
* @function getClassName
* @memberof Calendar.prototype
* @desc Return the calendar CSS class name based on its ID.
* @returns a string representing the foreground CSS class name
*/
Calendar.prototype.getClassName = function(base) {
if (angular.isUndefined(base))
base = 'fg';
return base + '-folder' + this.id;
};
/**
* @function $rename
* @memberof Calendar.prototype
* @desc Rename the calendar and keep the list sorted
* @param {string} name - the new name
* @returns a promise of the HTTP operation
*/
Calendar.prototype.$rename = function(name) {
var i = _.indexOf(_.pluck(Calendar.$calendars, 'id'), this.id);
this.name = name;
Calendar.$calendars.splice(i, 1);
Calendar.$add(this);
return this.$save();
};
/**
* @function $delete
* @memberof Calendar.prototype
* @desc Delete the calendar from the server and the static list of calendars.
* @returns a promise of the HTTP operation
*/
Calendar.prototype.$delete = function() {
var _this = this,
d = Calendar.$q.defer(),
list,
promise;
if (this.isSubscription) {
promise = Calendar.$$resource.fetch(this.id, 'unsubscribe');
list = Calendar.$subscriptions;
}
else {
promise = Calendar.$$resource.remove(this.id);
if (this.isWebCalendar)
list = Calendar.$webcalendars;
else
list = Calendar.$calendars;
}
promise.then(function() {
var i = _.indexOf(_.pluck(list, 'id'), _this.id);
list.splice(i, 1);
d.resolve();
}, function(data, status) {
d.reject(data);
});
return d.promise;
};
/**
* @function $deleteComponents
* @memberof Calendar
@@ -283,6 +227,116 @@
_this.$Component.$tasks = _.difference(_this.$Component.$tasks, components);
};
/**
* @function init
* @memberof Calendar.prototype
* @desc Extend instance with new data and compute additional attributes.
* @param {object} data - attributes of calendar
*/
Calendar.prototype.init = function(data) {
angular.extend(this, data);
// Add 'isOwned' and 'isSubscription' attributes based on active user (TODO: add it server-side?)
this.isOwned = Calendar.activeUser.isSuperUser || this.owner == Calendar.activeUser.login;
this.isSubscription = !this.isRemote && this.owner != Calendar.activeUser.login;
if (angular.isUndefined(this.$shadowData)) {
// Make a copy of the data for an eventual reset
this.$shadowData = this.$omit();
}
};
/**
* @function getClassName
* @memberof Calendar.prototype
* @desc Return the calendar CSS class name based on its ID.
* @returns a string representing the foreground CSS class name
*/
Calendar.prototype.getClassName = function(base) {
if (angular.isUndefined(base))
base = 'fg';
return base + '-folder' + this.id;
};
/**
* @function $rename
* @memberof Calendar.prototype
* @desc Rename the calendar and keep the list sorted
* @param {string} name - the new name
* @returns a promise of the HTTP operation
*/
Calendar.prototype.$rename = function() {
var _this = this,
i,
calendars;
if (this.name == this.$shadowData.name) {
// Name hasn't changed
return Calendar.$q.when();
}
if (this.isWebCalendar)
calendars = Calendar.$webcalendars;
else if (this.isSubscription)
calendars = Calendar.$subscriptions;
else
calendars = Calendar.$calendars;
i = _.indexOf(_.pluck(calendars, 'id'), this.id);
if (i > -1) {
return this.$save().then(function() {
calendars.splice(i, 1);
Calendar.$add(_this);
});
}
else {
return Calendar.$q.reject();
}
};
/**
* @function $delete
* @memberof Calendar.prototype
* @desc Delete the calendar from the server and the static list of calendars.
* @returns a promise of the HTTP operation
*/
Calendar.prototype.$delete = function() {
var _this = this,
list,
promise;
if (this.isSubscription) {
promise = Calendar.$$resource.fetch(this.id, 'unsubscribe');
list = Calendar.$subscriptions;
}
else {
promise = Calendar.$$resource.remove(this.id);
if (this.isWebCalendar)
list = Calendar.$webcalendars;
else
list = Calendar.$calendars;
}
return promise.then(function() {
var i = _.indexOf(_.pluck(list, 'id'), _this.id);
list.splice(i, 1);
});
};
/**
* @function $reset
* @memberof Mailbox.prototype
* @desc Reset the original state the mailbox's data.
*/
Calendar.prototype.$reset = function() {
var _this = this;
angular.forEach(this, function(value, key) {
if (key != 'constructor' && key[0] != '$') {
delete _this[key];
}
});
angular.extend(this, this.$shadowData);
this.$shadowData = this.$omit();
};
/**
* @function $save
* @memberof Calendar.prototype
@@ -290,7 +344,16 @@
* @returns a promise of the HTTP operation
*/
Calendar.prototype.$save = function() {
var _this = this;
return Calendar.$$resource.save(this.id, this.$omit()).then(function(data) {
// Make a copy of the data for an eventual reset
_this.$shadowData = _this.$omit();
return data;
}, function(data) {
Calendar.$log.error(JSON.stringify(data, undefined, 2));
// Restore previous version
_this.$reset();
return data;
});
};
UI/WebServerResources/js/Scheduler/CalendarsController.js
+25 -2
View File
@@ -6,8 +6,8 @@
/**
* @ngInject
*/
CalendarsController.$inject = ['$scope', '$rootScope', '$stateParams', '$state', '$timeout', '$q', '$mdDialog', '$log', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'Calendar', 'User', 'stateCalendars'];
function CalendarsController($scope, $rootScope, $stateParams, $state, $timeout, $q, $mdDialog, $log, focus, encodeUriFilter, Dialog, Settings, Calendar, User, stateCalendars) {
CalendarsController.$inject = ['$scope', '$rootScope', '$stateParams', '$state', '$timeout', '$q', '$mdDialog', '$log', 'sgFocus', 'Dialog', 'sgSettings', 'Calendar', 'User', 'stateCalendars'];
function CalendarsController($scope, $rootScope, $stateParams, $state, $timeout, $q, $mdDialog, $log, focus, Dialog, Settings, Calendar, User, stateCalendars) {
var vm = this;
vm.activeUser = Settings.activeUser;
@@ -15,6 +15,9 @@
vm.newCalendar = newCalendar;
vm.addWebCalendar = addWebCalendar;
vm.confirmDelete = confirmDelete;
vm.editFolder = editFolder;
vm.revertEditing = revertEditing;
vm.renameFolder = renameFolder;
vm.share = share;
vm.showLinks = showLinks;
vm.showProperties = showProperties;
@@ -157,6 +160,26 @@
}
}
function editFolder(folder) {
vm.calendarName = folder.name;
vm.editMode = folder.id;
focus('calendarName_' + folder.id);
}
function revertEditing(folder) {
folder.$reset();
vm.editMode = false;
}
function renameFolder(folder) {
folder.$rename()
.then(function(data) {
vm.editMode = false;
}, function(data, status) {
Dialog.alert(l('Warning'), data);
});
}
function share(calendar) {
calendar.$acl.$users().then(function() {
$mdDialog.show({
UI/WebServerResources/js/Scheduler/Scheduler.app.js
+1 -1
View File
@@ -20,7 +20,7 @@
calendars: {
templateUrl: 'UIxCalMainFrame', // UI/Templates/SchedulerUI/UIxCalMainFrame.wox
controller: 'CalendarsController',
controllerAs: 'calendars'
controllerAs: 'app'
}
},
resolve: {