From c35c00fa574ccbb83f5f1fd7a533339c0d0297e0 Mon Sep 17 00:00:00 2001
From: Abel Luck <abel@guardianproject.info>
Date: Tue, 11 Feb 2020 10:12:22 +0100
Subject: [PATCH] Fixes #2929 - Consistently handle the 'disabled' attribute of
 input elements.

---
 .../app/views/generic/attachment.jst.eco      |  2 +
 .../app/views/generic/checkbox.jst.eco        |  2 +-
 .../app/views/generic/date.jst.eco            |  2 +-
 .../app/views/generic/datetime.jst.eco        |  2 +-
 .../app/views/generic/radio.jst.eco           |  2 +-
 .../app/views/generic/richtext.jst.eco        |  4 +-
 .../views/generic/searchable_select.jst.eco   |  2 +
 .../app/views/generic/textarea.jst.eco        |  2 +-
 app/assets/stylesheets/zammad.scss            | 11 +++++
 public/assets/tests/form.js                   | 46 +++++++++++++++++++
 10 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/attachment.jst.eco b/app/assets/javascripts/app/views/generic/attachment.jst.eco
index 827312ade..2ab26dae8 100644
--- a/app/assets/javascripts/app/views/generic/attachment.jst.eco
+++ b/app/assets/javascripts/app/views/generic/attachment.jst.eco
@@ -1,5 +1,6 @@
 <div class="attachments"></div>
 <div class="article-attachment">
+  <% if !@attribute.disabled: %>
   <div class="attachmentPlaceholder">
     <span class="attachmentPlaceholder-inputHolder fileUpload">
       <% uid =  _.uniqueId('fileUpload_') %>
@@ -9,6 +10,7 @@
       </label>
     </span>
   </div>
+  <% end %>
   <div class="attachmentUpload hide">
     <div class="horizontal">
       <div class="u-highlight">
diff --git a/app/assets/javascripts/app/views/generic/checkbox.jst.eco b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
index 766f06c46..7e96f92d6 100644
--- a/app/assets/javascripts/app/views/generic/checkbox.jst.eco
+++ b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
@@ -1,7 +1,7 @@
 <div class="<%= @attribute.class %> checkbox checkbox--list">
 <% for row in @attribute.options: %>
   <label class="checkbox-replacement<%= ' is-disabled' if row.disabled %>">
-    <input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %> <%= row.disabled %>>
+    <input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %> <%= row.disabled %> <% if @attribute.disabled: %> disabled<% end %>>
     <%- @Icon('checkbox', 'icon-unchecked') %>
     <%- @Icon('checkbox-checked', 'icon-checked') %>
     <span class="label-text"><%= row.name %></span>
diff --git a/app/assets/javascripts/app/views/generic/date.jst.eco b/app/assets/javascripts/app/views/generic/date.jst.eco
index 44332bb7e..bf31a6c85 100644
--- a/app/assets/javascripts/app/views/generic/date.jst.eco
+++ b/app/assets/javascripts/app/views/generic/date.jst.eco
@@ -1,4 +1,4 @@
 <div class="control controls--date" data-name="<%= @attribute.nameRaw %>">
-  <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
+  <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>" <% if @attribute.disabled: %> disabled<% end %>>
   <input type="text" value="" class="form-control js-datepicker <%= @attribute.class %>" data-item="date" <% if @attribute.disabled: %> disabled<% end %>>
 </div>
diff --git a/app/assets/javascripts/app/views/generic/datetime.jst.eco b/app/assets/javascripts/app/views/generic/datetime.jst.eco
index 59331795d..175a2946d 100644
--- a/app/assets/javascripts/app/views/generic/datetime.jst.eco
+++ b/app/assets/javascripts/app/views/generic/datetime.jst.eco
@@ -1,5 +1,5 @@
 <div class="controls controls--datetime" data-name="<%= @attribute.nameRaw %>">
-  <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
+  <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>" <% if @attribute.disabled: %> disabled<% end %>>
   <input type="text" value="" class="form-control flex-shrink-horizontal js-datepicker <%= @attribute.class %>" data-item="date" <% if @attribute.disabled: %> disabled<% end %>>
   <div class="controls-label"><%- @T('at') %></div>
   <input type="text" value="" class="form-control time js-timepicker <%= @attribute.class %>" data-item="time" <% if @attribute.disabled: %> disabled<% end %>>
diff --git a/app/assets/javascripts/app/views/generic/radio.jst.eco b/app/assets/javascripts/app/views/generic/radio.jst.eco
index 8a41156c6..b72232d0e 100644
--- a/app/assets/javascripts/app/views/generic/radio.jst.eco
+++ b/app/assets/javascripts/app/views/generic/radio.jst.eco
@@ -1,7 +1,7 @@
 <div class="<%= @attribute.class %> radio radio--list">
 <% for row in @attribute.options: %>
   <label class="inline-label radio-replacement<%= ' is-disabled' if row.disabled %>">
-    <input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %> <%= row.disabled %>>
+    <input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %> <%= row.disabled %> <% if @attribute.disabled: %> disabled<% end %>>
     <%- @Icon('radio', 'icon-unchecked') %>
     <%- @Icon('radio-checked', 'icon-checked') %>
     <span class="label-text"><%- @T(row.name) %></span>
diff --git a/app/assets/javascripts/app/views/generic/richtext.jst.eco b/app/assets/javascripts/app/views/generic/richtext.jst.eco
index 36fd6bf7a..eced966ad 100644
--- a/app/assets/javascripts/app/views/generic/richtext.jst.eco
+++ b/app/assets/javascripts/app/views/generic/richtext.jst.eco
@@ -1,4 +1,4 @@
-<div class="richtext form-control">
+<div class="richtext form-control <% if @attribute.disabled: %>is-disabled<% end %>">
 	<% if @attribute.buttons: %>
     <div class="richtext-controls btn-group">
       <% for action in @attribute.buttons: %>
@@ -11,5 +11,5 @@
       <% end %>
     </div>
 	<% end %>
-  <div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>"><%- @attribute.value %></div>
+  <div contenteditable="<%= !@attribute.disabled %>" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>"><%- @attribute.value %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
index 70259c5c8..e85c5980b 100644
--- a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
+++ b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
@@ -7,6 +7,7 @@
     <%= @attribute.autofocus %>
     value="<%= @attribute.value %>"
     tabindex="-1"
+    <% if @attribute.disabled: %> disabled<% end %>
   >
   <input
     class="searchableSelect-main form-control js-input<%= " #{ @attribute.class }" if @attribute.class %>"
@@ -14,6 +15,7 @@
     value="<%= @attribute.valueName %>"
     autocomplete="off"
     <%= @attribute.required %>
+    <% if @attribute.disabled: %> disabled<% end %>
    >
   <div class="searchableSelect-autocomplete">
     <span class="searchableSelect-autocomplete-invisible js-autocomplete-invisible"></span>
diff --git a/app/assets/javascripts/app/views/generic/textarea.jst.eco b/app/assets/javascripts/app/views/generic/textarea.jst.eco
index 036660675..4c375e769 100644
--- a/app/assets/javascripts/app/views/generic/textarea.jst.eco
+++ b/app/assets/javascripts/app/views/generic/textarea.jst.eco
@@ -1 +1 @@
-<textarea id="<%= @attribute.id %>" name="<%= @attribute.name %>" class="form-control <%= @attribute.class %>" rows="<%= @attribute.rows %>" <%= @attribute.required %> <%= @attribute.autofocus %>><%= @attribute.value %></textarea>
+<textarea id="<%= @attribute.id %>" name="<%= @attribute.name %>" class="form-control <%= @attribute.class %>" rows="<%= @attribute.rows %>" <%= @attribute.required %> <%= @attribute.autofocus %> <% if @attribute.disabled: %> disabled<% end %>><%= @attribute.value %></textarea>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index e3be0244b..a3673cc0c 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2079,6 +2079,17 @@ input.time.time--12 {
   background: none;
 }
 
+.richtext.form-control [contenteditable="false"] {
+    cursor: not-allowed;
+    opacity: 1;
+    background: hsl(210,17%,93%);
+    border-color: hsl(210,10%,85%);
+    &:focus,
+    &.focus {
+      border-color: hsl(200,71%,59%);
+    }
+}
+
 .richtext.form-control .attachments.attachments--list:not(:empty) {
   border-top: 1px solid rgba(0,0,0,.04);
   white-space: normal;
diff --git a/public/assets/tests/form.js b/public/assets/tests/form.js
index 4f14cddf7..c8e6c0767 100644
--- a/public/assets/tests/form.js
+++ b/public/assets/tests/form.js
@@ -131,10 +131,14 @@ test("form params check", function() {
     select2: true,
     select3: null,
     select4: undefined,
+    select5: false,
     selectmulti1: false,
     selectmulti2: [ false, true ],
+    selectmulti3: false,
     selectmultioption1: false,
     selectmultioption2: [ false, true ],
+    selectmultioption2: [ false, true ],
+    selectmultioption3: false,
     autocompletion2: 'id2',
     autocompletion2_autocompletion_value_shown: 'value2',
     richtext2: '<div>lalu <b>b</b> lalu</div>',
@@ -144,19 +148,25 @@ test("form params check", function() {
     richtext6: '<div>lalu <b>b</b> lalu</div>',
     richtext7: "<div>&nbsp;<div>&nbsp;\n</div>  \n</div>",
     richtext8: '<div>lalu <i>b</i> lalu</div>',
+    richtext9: '<div>lalu <b>b</b> lalu</div>',
     datetime1: new Date(Date.parse('2015-01-11T12:40:00Z') ),
     datetime3: new Date(Date.parse('2015-01-11T12:40:00Z') ),
+    datetime5: new Date(Date.parse('2015-01-11T12:40:00Z') ),
     date1:     '2015-01-11',
     date3:     '2015-01-11',
+    date5:     '2015-01-11',
     active1:   true,
     active2:   false,
     checkbox1: [],
     checkbox2: undefined,
     checkbox3: 'd',
+    checkbox5: 'd',
     radiobox1: undefined,
     radiobox2: 'a',
+    radiobox3: 'a',
     boolean1:  true,
     boolean2:  false,
+    boolean4:  false,
   }
   new App.ControllerForm({
     el:        el,
@@ -164,18 +174,23 @@ test("form params check", function() {
       configure_attributes: [
         { name: 'input1', display: 'Input1', tag: 'input', type: 'text', limit: 100, null: true },
         { name: 'input2', display: 'Input2', tag: 'input', type: 'text', limit: 100, null: false },
+        { name: 'input3', display: 'Input3', tag: 'input', type: 'text', limit: 100, null: true, disabled: true },
         { name: 'password1', display: 'Password1', tag: 'input', type: 'password', limit: 100, null: true },
         { name: 'password2', display: 'Password2', tag: 'input', type: 'password', limit: 100, null: false },
         { name: 'textarea1', display: 'Textarea1', tag: 'textarea', rows: 6, limit: 100, null: true, upload: true },
         { name: 'textarea2', display: 'Textarea2', tag: 'textarea', rows: 6, limit: 100, null: false, upload: true },
+        { name: 'textarea3', display: 'Textarea3', tag: 'textarea', rows: 6, limit: 100, null: true, upload: false, disabled: true },
         { name: 'select1', display: 'Select1', tag: 'select', null: true, options: { true: 'internal', false: 'public' } },
         { name: 'select2', display: 'Select2', tag: 'select', null: false, options: { true: 'internal', false: 'public' } },
         { name: 'select3', display: 'Select3', tag: 'select', null: false, nulloption: true, options: { aa: 'aa', bb: 'bb', select3: 'select3' } },
         { name: 'select4', display: 'Select4', tag: 'select', null: false, nulloption: true,  options: { aa: 'aa', bb: 'bb', select3: 'select4' } },
+        { name: 'select5', display: 'Select5', tag: 'select', null: true, options: { true: 'internal', false: 'public' }, disabled: true },
         { name: 'selectmulti1', display: 'SelectMulti1', tag: 'select', null: true, multiple: true, options: { true: 'internal', false: 'public' } },
         { name: 'selectmulti2', display: 'SelectMulti2', tag: 'select', null: false, multiple: true, options: { true: 'internal', false: 'public' } },
+        { name: 'selectmulti3', display: 'SelectMulti3', tag: 'select', null: true, multiple: true, options: { true: 'internal', false: 'public' }, disabled: true },
         { name: 'selectmultioption1', display: 'SelectMultiOption1', tag: 'select', null: true, multiple: true, options: [{ value: true, name: 'internal' }, { value: false, name: 'public' }] },
         { name: 'selectmultioption2', display: 'SelectMultiOption2', tag: 'select', null: false, multiple: true, options: [{ value: true, name: 'A' }, { value: 1, name: 'B'}, { value: false, name: 'C' }] },
+        { name: 'selectmultioption3', display: 'SelectMultiOption3', tag: 'select', null: true, multiple: true, options: [{ value: true, name: 'internal' }, { value: false, name: 'public' }], disabled: true },
         { name: 'autocompletion1', display: 'AutoCompletion1', tag: 'autocompletion', null: false, options: { true: 'internal', false: 'public' }, source: [ { label: "Choice1", value: "value1", id: "id1" }, { label: "Choice2", value: "value2", id: "id2" }, ], minLength: 1 },
         { name: 'autocompletion2', display: 'AutoCompletion2', tag: 'autocompletion', null: false, options: { true: 'internal', false: 'public' }, source: [ { label: "Choice1", value: "value1", id: "id1" }, { label: "Choice2", value: "value2", id: "id2" }, ], minLength: 1 },
         { name: 'richtext1', display: 'Richtext1', tag: 'richtext', maxlength: 100, null: true, type: 'richtext', multiline: true, upload: true, default: defaults['richtext1'] },
@@ -186,25 +201,31 @@ test("form params check", function() {
         { name: 'richtext6', display: 'Richtext6', tag: 'richtext', maxlength: 100, null: true, type: 'textonly', multiline: true, upload: true, default: defaults['richtext6'] },
         { name: 'richtext7', display: 'Richtext7', tag: 'richtext', maxlength: 100, null: true, type: 'textonly', multiline: false, default: defaults['richtext7'] },
         { name: 'richtext8', display: 'Richtext8', tag: 'richtext', maxlength: 100, null: true, type: 'textonly', multiline: false, default: defaults['richtext8'] },
+        { name: 'richtext9', display: 'Richtext9', tag: 'richtext', maxlength: 100, null: true, type: 'richtext', multiline: true, upload: true, default: defaults['richtext9'], disabled: true},
         { name: 'datetime1', display: 'Datetime1', tag: 'datetime', null: true, default: defaults['datetime1'] },
         { name: 'datetime2', display: 'Datetime2', tag: 'datetime', null: true, default: defaults['datetime2'] },
         { name: 'datetime3', display: 'Datetime3', tag: 'datetime', null: false, default: defaults['datetime3'] },
         { name: 'datetime4', display: 'Datetime4', tag: 'datetime', null: false, default: defaults['datetime4'] },
+        { name: 'datetime5', display: 'Datetime4', tag: 'datetime', null: false, default: defaults['datetime5'], disabled: true },
         { name: 'date1',     display: 'Date1',     tag: 'date', null: true, default: defaults['date1'] },
         { name: 'date2',     display: 'Date2',     tag: 'date', null: true, default: defaults['date2'] },
         { name: 'date3',     display: 'Date3',     tag: 'date', null: false, default: defaults['date3'] },
         { name: 'date4',     display: 'Date4',     tag: 'date', null: false, default: defaults['date4'] },
+        { name: 'date5',     display: 'Date4',     tag: 'date', null: false, default: defaults['date5'], disabled: true },
         { name: 'active1',   display: 'Active1',   tag: 'active', default: defaults['active1'] },
         { name: 'active2',   display: 'Active2',   tag: 'active', default: defaults['active2'] },
         { name: 'checkbox1', display: 'Checkbox1', tag: 'checkbox', null: false, default: defaults['checkbox1'], options: { a: 'AA', b: 'BB' } },
         { name: 'checkbox2', display: 'Checkbox2', tag: 'checkbox', null: false, default: defaults['checkbox2'], options: { 1: '11' } },
         { name: 'checkbox3', display: 'Checkbox3', tag: 'checkbox', null: false, default: defaults['checkbox3'], options: { c: 'CC', d: 'DD' } },
         { name: 'checkbox4', display: 'Checkbox4', tag: 'checkbox', null: false, default: defaults['checkbox4'], options: { aa: 'AA', bb: 'BB' } },
+        { name: 'checkbox5', display: 'Checkbox5', tag: 'checkbox', null: false, default: defaults['checkbox5'], options: { c: 'CC', d: 'DD' }, disabled: true },
         { name: 'radiobox1', display: 'Radiobox1', tag: 'radio', null: false, default: defaults['radiobox1'], options: { a: 'AA', b: 'BB' } },
         { name: 'radiobox2', display: 'Radiobox2', tag: 'radio', null: false, default: defaults['radiobox2'], options: { a: '11' } },
+        { name: 'radiobox3', display: 'Radiobox3', tag: 'radio', null: false, default: defaults['radiobox3'], options: { a: 'AA', b: 'BB' }, disabled: true },
         { name: 'boolean1',  display: 'Boolean1',  tag: 'boolean',  null: false, default: defaults['boolean1'] },
         { name: 'boolean2',  display: 'Boolean2',  tag: 'boolean',  null: false, default: defaults['boolean2'] },
         { name: 'boolean3',  display: 'Boolean3',  tag: 'boolean',  null: false, default: defaults['boolean3'] },
+        { name: 'boolean4',  display: 'Boolean4',  tag: 'boolean',  null: false, default: defaults['boolean4'], disabled: true },
       ],
     },
     params: defaults,
@@ -218,6 +239,8 @@ test("form params check", function() {
   equal(el.find('[name="input2"]').prop('required'), true, 'check input2 required')
   equal(el.find('[name="input2"]').is(":focus"), false, 'check input2 focus')
 
+  equal(el.find('[name="input3"]').prop("disabled"), true, 'check input3 disabled')
+
   equal(el.find('[name="password1"]').val(), '', 'check password1 value')
   equal(el.find('[name="password1_confirm"]').val(), '', 'check password1 value')
   equal(el.find('[name="password1"]').prop('required'), false, 'check password1 required')
@@ -236,6 +259,8 @@ test("form params check", function() {
   equal(el.find('[name="textarea2"]').prop('required'), true, 'check textarea2 required')
   equal(el.find('[name="textarea2"]').is(":focus"), false, 'check textarea2 focus')
 
+  equal(el.find('[name="textarea3"]').prop("disabled"), true, 'check textarea3 disabled')
+
   equal(el.find('[name="select1"]').val(), 'false', 'check select1 value')
   equal(el.find('[name="select1"]').prop('required'), false, 'check select1 required')
   equal(el.find('[name="select1"]').is(":focus"), false, 'check select1 focus')
@@ -252,6 +277,8 @@ test("form params check", function() {
   equal(el.find('[name="select4"]').prop('required'), true, 'check select4 required')
   equal(el.find('[name="select4"]').is(":focus"), false, 'check select4 focus')
 
+  equal(el.find('[name="select5"]').prop("disabled"), true, 'check select5 disabled')
+
   equal(el.find('[name="selectmulti1"]').val(), 'false', 'check selectmulti1 value')
   equal(el.find('[name="selectmulti1"]').prop('required'), false, 'check selectmulti1 required')
   equal(el.find('[name="selectmulti1"]').is(":focus"), false, 'check selectmulti1 focus')
@@ -261,24 +288,37 @@ test("form params check", function() {
   equal(el.find('[name="selectmulti2"]').prop('required'), true, 'check selectmulti2 required')
   equal(el.find('[name="selectmulti2"]').is(":focus"), false, 'check selectmulti2 focus')
 
+  equal(el.find('[name="selectmulti3"]').prop("disabled"), true, 'check selectmulti3 disabled')
+  equal(el.find('[name="selectmultioption3"]').prop("disabled"), true, 'check selectmultioption3 disabled')
+
+  equal(el.find('[name="boolean4"]').prop("disabled"), true, 'check boolean4 disabled')
+  equal(el.find('[data-name="richtext9"]').prop("contenteditable"), "false", 'check richtext9 disabled')
+  equal(el.find('[name="checkbox5"]').prop("disabled"), true, 'check checkbox5 disabled')
+  equal(el.find('[name="radiobox3"]').prop("disabled"), true, 'check radiobox3 disabled')
+
   params = App.ControllerForm.params(el)
   test_params = {
     input1: '',
     input2: '123abc',
+    input3: '',
     password1: '',
     password1_confirm: '',
     password2: 'pw1234<l>',
     password2_confirm: 'pw1234<l>',
     textarea1: '',
     textarea2: 'lalu <l> lalu',
+    textarea3: '',
     select1: 'false',
     select2: 'true',
     select3: '',
     select4: '',
+    select5: 'false',
     selectmulti1: 'false',
     selectmulti2: [ 'true', 'false' ],
+    selectmulti3: 'false',
     selectmultioption1: 'false',
     selectmultioption2: [ 'true', 'false' ],
+    selectmultioption3: 'false',
     autocompletion1: '',
     autocompletion1_autocompletion: '',
     autocompletion1_autocompletion_value_shown: '',
@@ -293,25 +333,31 @@ test("form params check", function() {
     richtext6: '<div>lalu <b>b</b> lalu</div>',
     richtext7: '',
     richtext8: '<div>lalu <i>b</i> lalu</div>',
+    richtext9: '<div>lalu <b>b</b> lalu</div>',
     datetime1: '2015-01-11T12:40:00.000Z',
     datetime2: null,
     datetime3: '2015-01-11T12:40:00.000Z',
     datetime4: null,
+    datetime5: '2015-01-11T12:40:00.000Z',
     date1: '2015-01-11',
     date2: null,
     date3: '2015-01-11',
     date4: null,
+    date5: '2015-01-11',
     active1: true,
     active2: false,
     checkbox1: [],
     checkbox2: undefined,
     checkbox3: 'd',
     checkbox4: [],
+    checkbox5: 'd',
     radiobox1: undefined,
     radiobox2: 'a',
+    radiobox3: 'a',
     boolean1: true,
     boolean2: false,
     boolean3: true,
+    boolean4: false,
   }
   deepEqual(params, test_params, 'form param check')