diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-03-22 07:03:19 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-03-22 07:03:19 +0000 |
| commit | 30d91c85036132b3524845fee4746ae014c293d4 (patch) | |
| tree | b8149e62d1826d031ba7309d149b082b8fd882f1 /app/views | |
| parent | 2e86acfa8742651c47fe5719c6d458299a428003 (diff) | |
| download | redmine-30d91c85036132b3524845fee4746ae014c293d4.tar.gz redmine-30d91c85036132b3524845fee4746ae014c293d4.zip | |
Fix that Log time and/or Add notes sections from issue form page do not show or hide dynamically based on user permission (#34641).
git-svn-id: https://svn.redmine.org/redmine/trunk@21495 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/_edit.html.erb | 8 | ||||
| -rw-r--r-- | app/views/issues/edit.js.erb | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 954f606f3..226b6f988 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -9,8 +9,8 @@ </div> </fieldset> <% end %> - <% if User.current.allowed_to?(:log_time, @project) %> - <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend> + <% if User.current.allowed_to?(:log_time, @issue.project) %> + <fieldset class="tabular" id="log_time"><legend><%= l(:button_log_time) %></legend> <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %> <div class="splitcontent"> <div class="splitcontentleft"> @@ -28,7 +28,7 @@ </fieldset> <% end %> <% if @issue.notes_addable? %> - <fieldset><legend><%= l(:field_notes) %></legend> + <fieldset id="add_notes"><legend><%= l(:field_notes) %></legend> <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :data => { :auto_complete => true @@ -43,7 +43,7 @@ <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %> </fieldset> - <fieldset><legend><%= l(:label_attachment_plural) %></legend> + <fieldset id="add_attachments"><legend><%= l(:label_attachment_plural) %></legend> <% if @issue.attachments.any? && @issue.safe_attribute?('deleted_attachment_ids') %> <div class="contextual"><%= link_to l(:label_edit_attachments), '#', :onclick => "$('#existing-attachments').toggle(); return false;" %></div> <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>"> diff --git a/app/views/issues/edit.js.erb b/app/views/issues/edit.js.erb index 8c94aeceb..ed8fc3ca8 100644 --- a/app/views/issues/edit.js.erb +++ b/app/views/issues/edit.js.erb @@ -1,7 +1 @@ -replaceIssueFormWith('<%= escape_javascript(render :partial => 'form') %>'); - -<% if User.current.allowed_to?(:log_time, @issue.project) %> - $('#log_time').show(); -<% else %> - $('#log_time').hide(); -<% end %> +replaceIssueFormWith('<%= escape_javascript(render :partial => 'edit') %>'); |