Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Follow up - 2ffca390a9 - Fixes #1961 - S/MIME integration: Encryption and Sign buttons can be clicked even if disabled.

Browse source
This commit is contained in:
Thorsten Eckel 2020-06-10 12:24:27 +02:00
parent 4bb4f7d542
commit a336d5232d
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/lib/mixins/security_options.coffee
View file

@ -48,7 +48,7 @@ App.SecurityOptions =
if smimeConfig.group_id[type][ticket.group_id.toString()] == false if smimeConfig.group_id[type][ticket.group_id.toString()] == false
selected[selector] = false selected[selector] = false
@$('.js-securityEncrypt').attr('title', data.encryption.comment) @$('.js-securityEncryptComment').attr('title', data.encryption.comment)
# if encryption is possible # if encryption is possible
if data.encryption.success is true if data.encryption.success is true
@ -65,7 +65,7 @@ App.SecurityOptions =
@$('.js-securityEncrypt').attr('disabled', true) @$('.js-securityEncrypt').attr('disabled', true)
@$('.js-securityEncrypt').removeClass('btn--active') @$('.js-securityEncrypt').removeClass('btn--active')
@$('.js-securitySign').attr('title', data.sign.comment) @$('.js-securitySignComment').attr('title', data.sign.comment)
# if sign is possible # if sign is possible
if data.sign.success is true if data.sign.success is true

8
app/assets/javascripts/app/views/agent_ticket_create.jst.eco
View file

@ -33,8 +33,12 @@
<label for=""><%- @T('Security') %></label> <label for=""><%- @T('Security') %></label>
</div> </div>
<div class="horizontal"> <div class="horizontal">
<div class="btn btn--action js-securityEncrypt js-active-toggle" disabled><%- @Icon('lock-open', 'btn-inactive-icon') %><%- @Icon('lock', 'btn-active-icon') %><%- @T('Encrypt') %></div> <span class="js-securityEncryptComment">
<div class="btn btn--action js-securitySign js-active-toggle" disabled><%- @Icon('not-signed', 'btn-inactive-icon') %><%- @Icon('signed', 'btn-active-icon') %><%- @T('Sign') %></div> <div class="btn btn--action js-securityEncrypt js-active-toggle" disabled><%- @Icon('lock-open', 'btn-inactive-icon') %><%- @Icon('lock', 'btn-active-icon') %><%- @T('Encrypt') %></div>
</span>
<span class="js-securitySignComment" style="margin-left: 10px;">
<div class="btn btn--action js-securitySign js-active-toggle" disabled><%- @Icon('not-signed', 'btn-inactive-icon') %><%- @Icon('signed', 'btn-active-icon') %><%- @T('Sign') %></div>
</span>
</div> </div>
</div> </div>
<div class="article-form-top"></div> <div class="article-form-top"></div>

8
app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
View file

@ -61,8 +61,12 @@
<label for=""><%- @T('Security') %></label> <label for=""><%- @T('Security') %></label>
</div> </div>
<div class="horizontal"> <div class="horizontal">
<div class="btn btn--action js-securityEncrypt js-active-toggle" disabled><%- @Icon('lock-open', 'btn-inactive-icon') %><%- @Icon('lock', 'btn-active-icon') %><%- @T('Encrypt') %></div> <span class="js-securityEncryptComment">
<div class="btn btn--action js-securitySign js-active-toggle" disabled><%- @Icon('not-signed', 'btn-inactive-icon') %><%- @Icon('signed', 'btn-active-icon') %><%- @T('Sign') %></div> <div class="btn btn--action js-securityEncrypt js-active-toggle" disabled><%- @Icon('lock-open', 'btn-inactive-icon') %><%- @Icon('lock', 'btn-active-icon') %><%- @T('Encrypt') %></div>
</span>
<span class="js-securitySignComment" style="margin-left: 10px;">
<div class="btn btn--action js-securitySign js-active-toggle" disabled><%- @Icon('not-signed', 'btn-inactive-icon') %><%- @Icon('signed', 'btn-active-icon') %><%- @T('Sign') %></div>
</span>
</div> </div>
</div> </div>

2
app/assets/stylesheets/zammad.scss
View file

@ -155,6 +155,7 @@ a {
&.is-disabled, &.is-disabled,
&[disabled] { &[disabled] {
pointer-events: none;
cursor: not-allowed !important; cursor: not-allowed !important;
opacity: .33; opacity: .33;
} }
@ -442,6 +443,7 @@ pre code.hljs {
&.is-disabled, &.is-disabled,
&[disabled], &[disabled],
&:disabled { &:disabled {
pointer-events: none;
cursor: not-allowed; cursor: not-allowed;
opacity: .33; opacity: .33;
} }