jro_apps/redmine Commit - r11790:010bfc56e15f

Ability to save Gantt query filters (#7836)....

Jean-Philippe Lang -

r11790:010bfc56e15f

parent child

Context file:

r11790:010bfc56e15f

Collapse all files

db/migrate/20130713111657_add_queries_options.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddQueriesOptions < ActiveRecord::Migration
	2	def up
	3	add_column :queries, :options, :text
	4	end
	5
	6	def down
	7	remove_column :queries, :options
	8	end
	9	end

app/controllers/queries_controller.rb +15 -3

                 if @query.save
                   flash[:notice] = l(:notice_successful_create)
-                  redirect_to _project_issues_path(@project, :query_id => @query)
+                  redirect_to_issues(:query_id => @query)
                 else
                   render :action => 'new', :layout => !request.xhr?
                 end
                 if @query.save
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to _project_issues_path(@project, :query_id => @query)
+                  redirect_to_issues(:query_id => @query)
                 else
                   render :action => 'edit'
                 end
               def destroy
                 @query.destroy
-                redirect_to _project_issues_path(@project, :set_filter => 1)
+                redirect_to_issues(:set_filter => 1)
               end
             private
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def redirect_to_issues(options)
+                if params[:gantt]
+                  if @project
+                    redirect_to project_gantt_path(@project, options)
+                  else
+                    redirect_to issues_gantt_path(options)
+                  end
+                else
+                  redirect_to _project_issues_path(@project, options)
+                end
+              end
             end

app/models/issue_query.rb +25 0

@@ -97,6 +97,31 class IssueQuery < Query
97	!is_private?	97	!is_private?
98	end	98	end
99		99
		100	def draw_relations
		101	r = options[:draw_relations]
		102	r.nil? \|\| r == '1'
		103	end
		104
		105	def draw_relations=(arg)
		106	options[:draw_relations] = (arg == '0' ? '0' : nil)
		107	end
		108
		109	def draw_progress_line
		110	r = options[:draw_progress_line]
		111	r == '1'
		112	end
		113
		114	def draw_progress_line=(arg)
		115	options[:draw_progress_line] = (arg == '1' ? '1' : nil)
		116	end
		117
		118	def build_from_params(params)
		119	super
		120	self.draw_relations = params[:draw_relations] \|\| (params[:query] && params[:query][:draw_relations])
		121	self.draw_progress_line = params[:draw_progress_line] \|\| (params[:query] && params[:query][:draw_progress_line])
		122	self
		123	end
		124
100	def initialize_available_filters	125	def initialize_available_filters
101	principals = []	126	principals = []
102	subprojects = []	127	subprojects = []

app/models/query.rb +1 0

               serialize :filters
               serialize :column_names
               serialize :sort_criteria, Array
+              serialize :options, Hash
               attr_protected :project_id, :user_id

app/views/gantts/show.html.erb +18 -5

             <% @gantt.view = self %>
+            <div class="contextual">
+            <% if !@query.new_record? && @query.editable_by?(User.current) %>
+              <%= link_to l(:button_edit), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
+              <%= delete_link query_path(@query, :gantt => 1) %>
+            <% end %>
+            </div>
             <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
             <%= form_tag({:controller => 'gantts', :action => 'show',
                          :year => params[:year], :months => params[:months]},
                          :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
+            <%= hidden_field_tag 'gantt', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                     <td>
                       <fieldset>
                         <legend><%= l(:label_related_issues) %></legend>
-                        <label>
+                        <label for="draw_relations">
-                          <%= check_box_tag "draw_rels", params["draw_rels"], params[:set_filter].blank? || params[:draw_rels] %>
+                          <%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
                           <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
                           <% rels.each do |rel| %>
                             <% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
                     <td>
                       <fieldset>
                         <legend><%= l(:label_gantt_progress_line) %></legend>
-                        <label>
+                        <label for="draw_progress_line">
-                          <%= check_box_tag "draw_progress_line", params[:draw_progress_line], params[:draw_progress_line] %>
+                          <%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
                           <%= l(:label_display) %>
                         </label>
                       </fieldset>
                                  :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
                         :class => 'icon icon-reload' %>
+            <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
+              <%= link_to_function l(:button_save),
+                                   "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
+                                   :class => 'icon icon-save' %>
+            <% end %>
             </p>
             <% end %>
               $(document).ready(drawGanttHandler);
               $(window).resize(drawGanttHandler);
               $(function() {
-                $("#draw_rels").change(drawGanttHandler);
+                $("#draw_relations").change(drawGanttHandler);
                 $("#draw_progress_line").change(drawGanttHandler);
               });
             <% end %>

app/views/queries/_form.html.erb +9 0

             <div class="box">
             <div class="tabular">
+            <%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
             <p><label><%= l(:button_show) %></label>
             <%= available_block_columns_tags(@query) %></p>
+            <% if params[:gantt] %>
+              <p><label><%= l(:label_gantt) %></label>
+              <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
+              <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
+              </p>
+            <% end %>
             </fieldset>
             </div>

public/javascripts/gantt.js +1 -1

               setDrawArea();
               if ($("#draw_progress_line").attr('checked'))
                 drawGanttProgressLines();
-              if ($("#draw_rels").attr('checked'))
+              if ($("#draw_relations").attr('checked'))
                 drawRelations();
             }

test/functional/queries_controller_test.rb +37 0

@@ -155,6 +155,43 class QueriesControllerTest < ActionController::TestCase
155	assert_select 'input[name=?]', 'query[name]'	155	assert_select 'input[name=?]', 'query[name]'
156	end	156	end
157		157
		158	def test_create_global_query_from_gantt
		159	@request.session[:user_id] = 1
		160	assert_difference 'IssueQuery.count' do
		161	post :create,
		162	:gantt => 1,
		163	:operators => {"status_id" => "o"},
		164	:values => {"status_id" => ["1"]},
		165	:query => {:name => "test_create_from_gantt",
		166	:draw_relations => '1',
		167	:draw_progress_line => '1'}
		168	assert_response 302
		169	end
		170	query = IssueQuery.order('id DESC').first
		171	assert_redirected_to "/issues/gantt?query_id=#{query.id}"
		172	assert_equal true, query.draw_relations
		173	assert_equal true, query.draw_progress_line
		174	end
		175
		176	def test_create_project_query_from_gantt
		177	@request.session[:user_id] = 1
		178	assert_difference 'IssueQuery.count' do
		179	post :create,
		180	:project_id => 'ecookbook',
		181	:gantt => 1,
		182	:operators => {"status_id" => "o"},
		183	:values => {"status_id" => ["1"]},
		184	:query => {:name => "test_create_from_gantt",
		185	:draw_relations => '0',
		186	:draw_progress_line => '0'}
		187	assert_response 302
		188	end
		189	query = IssueQuery.order('id DESC').first
		190	assert_redirected_to "/projects/ecookbook/issues/gantt?query_id=#{query.id}"
		191	assert_equal false, query.draw_relations
		192	assert_equal false, query.draw_progress_line
		193	end
		194
158	def test_edit_global_public_query	195	def test_edit_global_public_query
159	@request.session[:user_id] = 1	196	@request.session[:user_id] = 1
160	get :edit, :id => 4	197	get :edit, :id => 4

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages