[DE] Edit and remove role

This commit is contained in:
Julia Radzhabova 2022-11-29 13:32:55 +03:00
parent ef5a145c76
commit 04002a766e

View file

@ -214,29 +214,24 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
var me = this, var me = this,
xy = me.$window.offset(), xy = me.$window.offset(),
rec = this.rolesList.getSelectedRec(), rec = this.rolesList.getSelectedRec();
props = (isEdit && rec) ? {name: rec.get('name'), color: rec.get('color')} : null;
var win = new DE.Views.RoleEditDlg({ var win = new DE.Views.RoleEditDlg({
oformManager: me.oformManager, oformManager: me.oformManager,
props : props, props : (isEdit && rec) ? {name: rec.get('name'), color: rec.get('color')} : null,
isEdit : isEdit, isEdit : (isEdit && rec),
handler : function(result, settings) { handler : function(result, settings) {
if (result == 'ok' && settings) { if (result == 'ok' && settings) {
var color = settings.color, me.lastSelectedRole = settings.name;
name = settings.name;
me.lastSelectedRole = name; var role = new AscCommon.CRoleSettings();
if (isEdit) { role.asc_putName(settings.name);
// me.api.asc_editRole(settings); role.asc_putColor(settings.color);
rec.set('name', name); if (isEdit && rec) {
rec.set('color', color); me.oformManager.asc_editRole(rec.get('name'), role);
} else { } else {
var role = new AscCommon.CRoleSettings();
role.asc_putName(name);
role.asc_putColor(color);
me.oformManager.asc_addRole(role); me.oformManager.asc_addRole(role);
} }
me.updateButtons();
} }
} }
}).on('close', function() { }).on('close', function() {
@ -264,20 +259,8 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
} }
var callback = function(toRole) { var callback = function(toRole) {
var index = store.indexOf(rec); me.lastSelectedRole = store.indexOf(rec);
me.lastSelectedRole = index; me.oformManager.asc_removeRole(rec.get('name'), toRole); // remove role and move it's fields
me.api.asc_delRole(rec.get('name'), toRole); // remove role and move it's fields
// if (toRole) {
// var item = store.findWhere({name: toRole});
// item && item.set('fields', item.get('fields') + rec.get('fields'));
// // me.api.asc_moveFieldsToRole(rec.get('name'), toRole); // from - to
// }
// me.api.asc_delRole(rec.get('name'), toRole); // remove role and move it's fields
// store.remove(rec);
// (store.length>0) && me.rolesList.selectByIndex(index<store.length ? index : store.length-1);
// me.rolesList.scrollToRecord(me.rolesList.getSelectedRec());
// me.updateButtons();
}; };
if (rec.get('fields')<1) { if (rec.get('fields')<1) {