Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-02 19:36:00 +01:00
Code Issues Packages Projects Releases Activity

Makes spent time queries savable (#14790).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15639 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-07-12 17:40:19 +00:00
parent 7c6757c81a
commit beb5e60391
11 changed files with 96 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/queries_controller.rb
View File

@@ -60,7 +60,7 @@ class QueriesController < ApplicationController
if @query.save
flash[:notice] = l(:notice_successful_create)
redirect_to_issues(:query_id => @query)
redirect_to_items(:query_id => @query)
else
render :action => 'new', :layout => !request.xhr?
end
@@ -74,7 +74,7 @@ class QueriesController < ApplicationController
if @query.save
flash[:notice] = l(:notice_successful_update)
redirect_to_issues(:query_id => @query)
redirect_to_items(:query_id => @query)
else
render :action => 'edit'
end
@@ -82,7 +82,7 @@ class QueriesController < ApplicationController
def destroy
@query.destroy
redirect_to_issues(:set_filter => 1)
redirect_to_items(:set_filter => 1)
end
private
@@ -117,7 +117,12 @@ class QueriesController < ApplicationController
@query
end
def redirect_to_issues(options)
def redirect_to_items(options)
method = "redirect_to_#{@query.class.name.underscore}"
send method, options
end
def redirect_to_issue_query(options)
if params[:gantt]
if @project
redirect_to project_gantt_path(@project, options)
@@ -129,6 +134,10 @@ class QueriesController < ApplicationController
end
end
def redirect_to_time_entry_query(options)
redirect_to _time_entries_path(@project, nil, options)
end
# Returns the Query subclass, IssueQuery by default
# for compatibility with previous behaviour
def query_class