jro_apps/redmine Commit - r1297:da641f4122f7

Global queries can be saved from the global issue list (follows r1311 and closes #897)....

Jean-Philippe Lang -

r1297:da641f4122f7

parent child

Context file:

r1297:da641f4122f7

Collapse all files

app/controllers/queries_controller.rb +4 -3

               layout 'base'
               menu_item :issues
               before_filter :find_query, :except => :new
-              before_filter :find_project, :authorize, :only => :new
+              before_filter :find_optional_project, :only => :new
               def new
                 @query = Query.new(params[:query])
                 render_404
               end
-              def find_project
+              def find_optional_project
-                @project = Project.find(params[:project_id])
+                @project = Project.find(params[:project_id]) if params[:project_id]
+                User.current.allowed_to?(:save_queries, @project, :global => true)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

app/models/user.rb +20 -11

@@ -222,17 +222,26 class User < ActiveRecord::Base
222	# action can be:	222	# action can be:
223	# * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')	223	# * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
224	# * a permission Symbol (eg. :edit_project)	224	# * a permission Symbol (eg. :edit_project)
225	def allowed_to?(action, project)	225	def allowed_to?(action, project, options={})
226	# No action allowed on archived projects	226	if project
227	return false unless project.active?	227	# No action allowed on archived projects
228	# No action allowed on disabled modules	228	return false unless project.active?
229	return false unless project.allows_to?(action)	229	# No action allowed on disabled modules
230	# Admin users are authorized for anything else	230	return false unless project.allows_to?(action)
231	return true if admin?	231	# Admin users are authorized for anything else
232		232	return true if admin?
233	role = role_for_project(project)	233
234	return false unless role	234	role = role_for_project(project)
235	role.allowed_to?(action) && (project.is_public? \|\| role.member?)	235	return false unless role
		236	role.allowed_to?(action) && (project.is_public? \|\| role.member?)
		237
		238	elsif options[:global]
		239	# authorize if user has at least one role that has this permission
		240	roles = memberships.collect {\|m\| m.role}.uniq
		241	roles.detect {\|r\| r.allowed_to?(action)}
		242	else
		243	false
		244	end
236	end	245	end
237		246
238	def self.current=(user)	247	def self.current=(user)

app/views/issues/_sidebar.rhtml +1 -1

-            <% if @project %>
             <h3><%= l(:label_issue_plural) %></h3>
             <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
+            <% if @project %>
             <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
             <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
             <% end %>

app/views/issues/index.rhtml +1 -1

                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
-                <% if current_role && current_role.allowed_to?(:save_queries) %>
+                <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
                 <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
                 <% end %>
                 </p>

test/functional/queries_controller_test.rb +35 -9

                 User.current = nil
               end
-              def test_get_new
+              def test_get_new_project_query
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                                                              :disabled => nil }
               end
+              def test_get_new_global_query
+                @request.session[:user_id] = 2
+                get :new
+                assert_response :success
+                assert_template 'new'
+                assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                                :name => 'query[is_public]' }
+                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                             :name => 'query_is_for_all',
+                                                             :checked => 'checked',
+                                                             :disabled => nil }
+              end
               def test_new_project_public_query
                 @request.session[:user_id] = 2
                 post :new,
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_new_project_public_query", "is_public" => "1"},
+                     :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
-                     :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
                 q = Query.find_by_name('test_new_project_public_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_new_project_private_query", "is_public" => "1"},
+                     :query => {"name" => "test_new_project_private_query", "is_public" => "1"}
-                     :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
                 q = Query.find_by_name('test_new_project_private_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
                 assert q.valid?
               end
+              def test_new_global_private_query_with_custom_columns
+                @request.session[:user_id] = 3
+                post :new,
+                     :confirm => '1',
+                     :fields => ["status_id", "assigned_to_id"],
+                     :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+                     :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
+                     :query => {"name" => "test_new_global_private_query", "is_public" => "1", "column_names" => ["", "tracker", "subject", "priority", "category"]}
+                q = Query.find_by_name('test_new_global_private_query')
+                assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+                assert !q.is_public?
+                assert !q.has_default_columns?
+                assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}
+                assert q.valid?
+              end
               def test_get_edit_global_public_query
                 @request.session[:user_id] = 1
                 get :edit, :id => 4
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_edit_global_public_query", "is_public" => "1"},
+                     :query => {"name" => "test_edit_global_public_query", "is_public" => "1"}
-                     :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
                 q = Query.find_by_name('test_edit_global_public_query')
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
-                     :query => {"name" => "test_edit_global_private_query", "is_public" => "1"},
+                     :query => {"name" => "test_edit_global_private_query", "is_public" => "1"}
-                     :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
                 q = Query.find_by_name('test_edit_global_private_query')

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