##// END OF EJS Templates
Reverts r3366....
Jean-Philippe Lang -
r3253:ea51dcf91196
parent child
Show More
@@ -57,13 +57,13 class IssuesController < ApplicationController
57 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
57 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
58
58
59 if @query.valid?
59 if @query.valid?
60 limit = case params[:format]
60 limit = per_page_option
61 when 'csv', 'pdf'
61 respond_to do |format|
62 Setting.issues_export_limit.to_i
62 format.html { }
63 when 'atom'
63 format.xml { }
64 Setting.feeds_limit.to_i
64 format.atom { limit = Setting.feeds_limit.to_i }
65 else
65 format.csv { limit = Setting.issues_export_limit.to_i }
66 per_page_option
66 format.pdf { limit = Setting.issues_export_limit.to_i }
67 end
67 end
68
68
69 @issue_count = @query.issue_count
69 @issue_count = @query.issue_count
@@ -157,12 +157,10 class IssuesController < ApplicationController
157 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
157 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
158 if @issue.save
158 if @issue.save
159 attach_files(@issue, params[:attachments])
159 attach_files(@issue, params[:attachments])
160 flash[:notice] = l(:notice_successful_create)
160 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
161 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
161 respond_to do |format|
162 respond_to do |format|
162 format.html {
163 format.html {
163 # Displays a link to the newly created issue in the flash message
164 link = @template.link_to("##{@issue.id}", {:controller => 'issues', :action => 'show', :id => @issue})
165 flash[:notice] = l(:notice_issue_created, :value => link)
166 redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
164 redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
167 { :action => 'show', :id => @issue })
165 { :action => 'show', :id => @issue })
168 }
166 }
@@ -175,7 +173,7 class IssuesController < ApplicationController
175 format.xml { render(:xml => @issue.errors, :status => :unprocessable_entity); return }
173 format.xml { render(:xml => @issue.errors, :status => :unprocessable_entity); return }
176 end
174 end
177 end
175 end
178 end
176 end
179 @priorities = IssuePriority.all
177 @priorities = IssuePriority.all
180 render :layout => !request.xhr?
178 render :layout => !request.xhr?
181 end
179 end
General Comments 0
You need to be logged in to leave comments. Login now