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

Use "Signer" name when signature signer name is empty.

Browse source
This commit is contained in:
Julia Radzhabova 2017-11-30 13:43:47 +03:00
parent 288e14ff2f
commit f3fb154676
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,10 +168,12 @@ define([
var me = this, var me = this,
requestedSignatures = [], requestedSignatures = [],
validSignatures = [], validSignatures = [],
invalidSignatures = []; invalidSignatures = [],
name_index = 1;
_.each(requested, function(item, index){ _.each(requested, function(item, index){
requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); var name = item.asc_getSigner1();
requestedSignatures.push({name: (name !== "") ? name : (me.strSigner + " " + name_index++) , guid: item.asc_getGuid(), requested: true});
}); });
_.each(valid, function(item, index){ _.each(valid, function(item, index){
var item_date = item.asc_getDate(); var item_date = item.asc_getDate();
@ -381,7 +383,8 @@ define([
txtContinueEditing: 'Edit anyway', txtContinueEditing: 'Edit anyway',
notcriticalErrorTitle: 'Warning', notcriticalErrorTitle: 'Warning',
txtEditWarning: 'Editing will remove the signatures from the document.<br>Are you sure you want to continue?', txtEditWarning: 'Editing will remove the signatures from the document.<br>Are you sure you want to continue?',
strDelete: 'Remove Signature' strDelete: 'Remove Signature',
strSigner: 'Signer'
}, DE.Views.SignatureSettings || {})); }, DE.Views.SignatureSettings || {}));
}); });

1
apps/documenteditor/main/locale/en.json
View file

@ -1418,6 +1418,7 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom", "DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.ShapeSettings.txtWood": "Wood", "DE.Views.ShapeSettings.txtWood": "Wood",
"DE.Views.SignatureSettings.strSignature": "Signature", "DE.Views.SignatureSettings.strSignature": "Signature",
"DE.Views.SignatureSettings.strSigner": "Signer",
"DE.Views.SignatureSettings.strRequested": "Requested signatures", "DE.Views.SignatureSettings.strRequested": "Requested signatures",
"DE.Views.SignatureSettings.strValid": "Valid signatures", "DE.Views.SignatureSettings.strValid": "Valid signatures",
"DE.Views.SignatureSettings.strInvalid": "Invalid signatures", "DE.Views.SignatureSettings.strInvalid": "Invalid signatures",

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

@ -168,10 +168,12 @@ define([
var me = this, var me = this,
requestedSignatures = [], requestedSignatures = [],
validSignatures = [], validSignatures = [],
invalidSignatures = []; invalidSignatures = [],
name_index = 1;
_.each(requested, function(item, index){ _.each(requested, function(item, index){
requestedSignatures.push({name: item.asc_getSigner1(), guid: item.asc_getGuid(), requested: true}); var name = item.asc_getSigner1();
requestedSignatures.push({name: (name !== "") ? name : (me.strSigner + " " + name_index++) , guid: item.asc_getGuid(), requested: true});
}); });
_.each(valid, function(item, index){ _.each(valid, function(item, index){
var item_date = item.asc_getDate(); var item_date = item.asc_getDate();
@ -380,7 +382,8 @@ define([
txtContinueEditing: 'Edit anyway', txtContinueEditing: 'Edit anyway',
notcriticalErrorTitle: 'Warning', notcriticalErrorTitle: 'Warning',
txtEditWarning: 'Editing will remove the signatures from the workbook.<br>Are you sure you want to continue?', txtEditWarning: 'Editing will remove the signatures from the workbook.<br>Are you sure you want to continue?',
strDelete: 'Remove Signature' strDelete: 'Remove Signature',
strSigner: 'Signer'
}, SSE.Views.SignatureSettings || {})); }, SSE.Views.SignatureSettings || {}));
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1488,6 +1488,7 @@
"SSE.Views.ShapeSettings.txtPapyrus": "Papyrus", "SSE.Views.ShapeSettings.txtPapyrus": "Papyrus",
"SSE.Views.ShapeSettings.txtWood": "Wood", "SSE.Views.ShapeSettings.txtWood": "Wood",
"SSE.Views.SignatureSettings.strSignature": "Signature", "SSE.Views.SignatureSettings.strSignature": "Signature",
"SSE.Views.SignatureSettings.strSigner": "Signer",
"SSE.Views.SignatureSettings.strRequested": "Requested signatures", "SSE.Views.SignatureSettings.strRequested": "Requested signatures",
"SSE.Views.SignatureSettings.strValid": "Valid signatures", "SSE.Views.SignatureSettings.strValid": "Valid signatures",
"SSE.Views.SignatureSettings.strInvalid": "Invalid signatures", "SSE.Views.SignatureSettings.strInvalid": "Invalid signatures",