diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index 4fa7f30cc..570dd08c5 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -173,7 +173,7 @@ define([ me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); }); _.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); }); @@ -237,8 +237,11 @@ define([ menu.items[1].setVisible(!requested); menu.items[2].setVisible(requested || !record.get('invisible')); menu.items[3].setVisible(!requested); + menu.items[0].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.cmpEl.attr('data-value', record.get('guid')); @@ -264,7 +267,7 @@ define([ Common.NotificationCenter.trigger('protect:sign', guid); break; case 1: - this.api.asc_ViewCertificate(guid); + this.api.asc_ViewCertificate(item.cmpEl.attr('data-value')); break; case 2: Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js index 805e93ea3..111532dcf 100644 --- a/apps/presentationeditor/main/app/view/SignatureSettings.js +++ b/apps/presentationeditor/main/app/view/SignatureSettings.js @@ -155,7 +155,7 @@ define([ me._state.invalidSignatures = []; _.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); }); @@ -211,6 +211,8 @@ define([ }); } 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')); menuContainer.css({left: showPoint[0], top: showPoint[1]}); @@ -230,7 +232,7 @@ define([ var guid = menu.cmpEl.attr('data-value'); switch (item.value) { case 1: - this.api.asc_ViewCertificate(guid); + this.api.asc_ViewCertificate(item.cmpEl.attr('data-value')); break; case 3: this.api.asc_RemoveSignature(guid); diff --git a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js index c5fb272f2..753c0185a 100644 --- a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js @@ -173,7 +173,7 @@ define([ me._state.requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); }); _.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); }); @@ -237,8 +237,11 @@ define([ menu.items[1].setVisible(!requested); menu.items[2].setVisible(requested || !record.get('invisible')); menu.items[3].setVisible(!requested); + menu.items[0].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.cmpEl.attr('data-value', record.get('guid')); @@ -264,7 +267,7 @@ define([ Common.NotificationCenter.trigger('protect:sign', guid); break; case 1: - this.api.asc_ViewCertificate(guid); + this.api.asc_ViewCertificate(item.cmpEl.attr('data-value')); break; case 2: Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature