Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Signature refactoring: use certificateId for viewing certificate.

Browse source
This commit is contained in:
Julia Radzhabova 2017-11-20 14:06:23 +03:00
parent b255446ec2
commit 707a6258c3
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/documenteditor/main/app/view/SignatureSettings.js
View file

@ -173,7 +173,7 @@ define([
me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true});
}); });
_.each(valid, function(item, index){ _.each(valid, function(item, index){
var sign = {name: item.asc_getSigner1(), guid: item.asc_getId(), date: '18/05/2017', invisible: !item.asc_getVisible()}; var sign = {name: item.asc_getSigner1(), certificateId: item.asc_getId(), guid: item.asc_getGuid(), date: item.asc_getDate(), invisible: !item.asc_getVisible()};
(item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign); (item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign);
}); });
@ -237,8 +237,11 @@ define([
menu.items[1].setVisible(!requested); menu.items[1].setVisible(!requested);
menu.items[2].setVisible(requested || !record.get('invisible')); menu.items[2].setVisible(requested || !record.get('invisible'));
menu.items[3].setVisible(!requested); menu.items[3].setVisible(!requested);
menu.items[0].setDisabled(this._locked); menu.items[0].setDisabled(this._locked);
menu.items[3].setDisabled(this._locked); menu.items[3].setDisabled(this._locked);
menu.items[1].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings
menu.cmpEl.attr('data-value', record.get('guid')); menu.cmpEl.attr('data-value', record.get('guid'));
@ -264,7 +267,7 @@ define([
Common.NotificationCenter.trigger('protect:sign', guid); Common.NotificationCenter.trigger('protect:sign', guid);
break; break;
case 1: case 1:
this.api.asc_ViewCertificate(guid); this.api.asc_ViewCertificate(item.cmpEl.attr('data-value'));
break; break;
case 2: case 2:
Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature

6
apps/presentationeditor/main/app/view/SignatureSettings.js
View file

@ -155,7 +155,7 @@ define([
me._state.invalidSignatures = []; me._state.invalidSignatures = [];
_.each(valid, function(item, index){ _.each(valid, function(item, index){
var sign = {name: item.asc_getSigner1(), guid: item.asc_getId(), date: '18/05/2017'}; var sign = {name: item.asc_getSigner1(), certificateId: item.asc_getId(), guid: item.asc_getGuid(), date: item.asc_getDate()};
(item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign); (item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign);
}); });
@ -211,6 +211,8 @@ define([
}); });
} }
menu.items[1].setDisabled(this._locked); menu.items[1].setDisabled(this._locked);
menu.items[0].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
menu.cmpEl.attr('data-value', record.get('guid')); menu.cmpEl.attr('data-value', record.get('guid'));
menuContainer.css({left: showPoint[0], top: showPoint[1]}); menuContainer.css({left: showPoint[0], top: showPoint[1]});
@ -230,7 +232,7 @@ define([
var guid = menu.cmpEl.attr('data-value'); var guid = menu.cmpEl.attr('data-value');
switch (item.value) { switch (item.value) {
case 1: case 1:
this.api.asc_ViewCertificate(guid); this.api.asc_ViewCertificate(item.cmpEl.attr('data-value'));
break; break;
case 3: case 3:
this.api.asc_RemoveSignature(guid); this.api.asc_RemoveSignature(guid);

7
apps/spreadsheeteditor/main/app/view/SignatureSettings.js
View file

@ -173,7 +173,7 @@ define([
me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true});
}); });
_.each(valid, function(item, index){ _.each(valid, function(item, index){
var sign = {name: item.asc_getSigner1(), guid: item.asc_getId(), date: '18/05/2017', invisible: !item.asc_getVisible()}; var sign = {name: item.asc_getSigner1(), certificateId: item.asc_getId(), guid: item.asc_getGuid(), date: item.asc_getDate(), invisible: !item.asc_getVisible()};
(item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign); (item.asc_getValid()==0) ? me._state.validSignatures.push(sign) : me._state.invalidSignatures.push(sign);
}); });
@ -237,8 +237,11 @@ define([
menu.items[1].setVisible(!requested); menu.items[1].setVisible(!requested);
menu.items[2].setVisible(requested || !record.get('invisible')); menu.items[2].setVisible(requested || !record.get('invisible'));
menu.items[3].setVisible(!requested); menu.items[3].setVisible(!requested);
menu.items[0].setDisabled(this._locked); menu.items[0].setDisabled(this._locked);
menu.items[3].setDisabled(this._locked); menu.items[3].setDisabled(this._locked);
menu.items[1].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings
menu.cmpEl.attr('data-value', record.get('guid')); menu.cmpEl.attr('data-value', record.get('guid'));
@ -264,7 +267,7 @@ define([
Common.NotificationCenter.trigger('protect:sign', guid); Common.NotificationCenter.trigger('protect:sign', guid);
break; break;
case 1: case 1:
this.api.asc_ViewCertificate(guid); this.api.asc_ViewCertificate(item.cmpEl.attr('data-value'));
break; break;
case 2: case 2:
Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature