Commit 3aa0f8d1 by Van Hau Le

Fix issue

parent 67d8154e
Pipeline #73 canceled with stages
in 0 seconds
...@@ -30,7 +30,7 @@ class ContextMenusController < ApplicationController ...@@ -30,7 +30,7 @@ class ContextMenusController < ApplicationController
@allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&) @allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
@can = {:edit => @issues.all?(&:attributes_editable?), @can = {:edit => @issues.all?(&:attributes_editable?),
:log_time => (@project && User.current.allowed_to?(:log_time, @project) && !@issue.is_user_story?), :log_time => (@project && User.current.allowed_to?(:log_time, @project) && !@issue&.is_user_story?),
:copy => User.current.allowed_to?(:copy_issues, @projects) && Issue.allowed_target_projects.any?, :copy => User.current.allowed_to?(:copy_issues, @projects) && Issue.allowed_target_projects.any?,
:add_watchers => User.current.allowed_to?(:add_issue_watchers, @projects), :add_watchers => User.current.allowed_to?(:add_issue_watchers, @projects),
:delete => @issues.all?(&:deletable?) :delete => @issues.all?(&:deletable?)
......
<div class="contextual"> <div class="contextual">
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %> <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
<%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) && !@issue.is_user_story? %> <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) && !@issue&.is_user_story? %>
<%= watcher_link(@issue, User.current) %> <%= watcher_link(@issue, User.current) %>
<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %> <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
<%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if @issue.deletable? %> <%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
</fieldset> </fieldset>
<% end %> <% end %>
<% if User.current.allowed_to?(:log_time, @project) && !@issue.is_user_story? %> <% if User.current.allowed_to?(:log_time, @project) && !@issue&.is_user_story? %>
<fieldset class="tabular"><legend><%= l(:button_log_time) %></legend> <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
<%= labelled_fields_for :time_entry, @time_entry do |time_entry| %> <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
<div class="splitcontent"> <div class="splitcontent">
......
<div class="contextual"> <div class="contextual">
<%= link_to l(:button_log_time), <%= link_to l(:button_log_time),
_new_time_entry_path(@project, @query.filtered_issue_id), _new_time_entry_path(@project, @query.filtered_issue_id),
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) && !@issue.is_user_story? %> :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) && !@issue&.is_user_story? %>
</div> </div>
<h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2> <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
......
<div class="contextual"> <div class="contextual">
<%= link_to l(:button_log_time), <%= link_to l(:button_log_time),
_new_time_entry_path(@project, @issue), _new_time_entry_path(@project, @issue),
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) && !@issue.is_user_story? %> :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) && !@issue&.is_user_story? %>
</div> </div>
<h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2> <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment