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

[Common] Sign dialog: don't sign when certificate in undefined.

Browse source
This commit is contained in:
Julia Radzhabova 2017-11-17 12:08:40 +03:00
parent 66fe289633
commit 9769137252
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/view/SignDialog.js
View file

@ -104,7 +104,7 @@ define([
'<td><label style="font-weight: bold;margin-bottom: 3px;">' + this.textCertificate + '</label></td>' + '<td><label style="font-weight: bold;margin-bottom: 3px;">' + this.textCertificate + '</label></td>' +
'<td rowspan="2" style="vertical-align: top; padding-left: 30px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="">' + this.textChange + '</button></td>', '<td rowspan="2" style="vertical-align: top; padding-left: 30px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="">' + this.textChange + '</button></td>',
'</tr>', '</tr>',
'<tr><td><div id="id-dlg-sign-certificate" style="max-width: 212px;overflow: hidden;"></td></tr>', '<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 212px;overflow: hidden;"></td></tr>',
'</table>', '</table>',
'</div>', '</div>',
'<div class="footer center">', '<div class="footer center">',
@ -227,6 +227,11 @@ define([
}); });
me.btnChangeCertificate.on('click', _.bind(me.onChangeCertificate, me)); me.btnChangeCertificate.on('click', _.bind(me.onChangeCertificate, me));
me.btnOk = new Common.UI.Button({
el: $window.find('.primary'),
disabled: true
});
me.cntCertificate = $('#id-dlg-sign-certificate'); me.cntCertificate = $('#id-dlg-sign-certificate');
me.cntVisibleSign = $('#id-dlg-sign-visible'); me.cntVisibleSign = $('#id-dlg-sign-visible');
me.cntInvisibleSign = $('#id-dlg-sign-invisible'); me.cntInvisibleSign = $('#id-dlg-sign-invisible');
@ -301,7 +306,7 @@ define([
_handleInput: function(state) { _handleInput: function(state) {
if (this.options.handler) { if (this.options.handler) {
if (state == 'ok' && this.signObject && !this.signObject.isValid()) if (state == 'ok' && (this.btnOk.isDisabled() || this.signObject && !this.signObject.isValid()))
return; return;
this.options.handler.call(this, this, state); this.options.handler.call(this, this, state);
@ -318,6 +323,8 @@ define([
var date = certificate.date, var date = certificate.date,
arr_date = (typeof date == 'string') ? date.split(' - ') : ['', '']; arr_date = (typeof date == 'string') ? date.split(' - ') : ['', ''];
this.cntCertificate.html(this.templateCertificate({name: certificate.name, valid: this.textValid.replace('%1', arr_date[0]).replace('%2', arr_date[1])})); this.cntCertificate.html(this.templateCertificate({name: certificate.name, valid: this.textValid.replace('%1', arr_date[0]).replace('%2', arr_date[1])}));
this.cntCertificate.toggleClass('hidden', this.certificateId<0);
this.btnOk.setDisabled(this.certificateId<0);
}, },
onSelectImage: function() { onSelectImage: function() {