summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-03 17:21:36 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-03 17:21:36 +0000
commit299c3de64e43eaf4451857a6623cc446130d9005 (patch)
treeefc55b86bb480b1a11291e94192fd77bc2c35dbd /app
parent331c1f674dc2a8b17062a1422e14189d116f4277 (diff)
downloadredmine-299c3de64e43eaf4451857a6623cc446130d9005.tar.gz
redmine-299c3de64e43eaf4451857a6623cc446130d9005.zip
The cancel operation in the issue edit mode doesn't work (#21579).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16361 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/issues/_edit.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index fff258db5..fe2119a07 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -69,7 +69,7 @@
<%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
<%= submit_tag l(:button_submit) %>
<%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
- | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
+ | <%= link_to l(:button_cancel), issue_path(id: @issue.id), :onclick => params[:action] == 'show' ? "$('#update').hide(); return false;" : '' %>
<%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
<%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>