jro_apps/redmine Commit - r2651:8141110eb269

0

app/controllers/application.rb +7 -2

               end
               # Authorize the user for the requested action
-              def authorize(ctrl = params[:controller], action = params[:action])
+              def authorize(ctrl = params[:controller], action = params[:action], global = false)
-                allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
+                allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project, :global => global)
                 allowed ? true : deny_access
               end
+              # Authorize the user for the requested action outside a project
+              def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
+                authorize(ctrl, action, global)
+              end
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter for actions that do not require any particular permission on the project

0

app/controllers/projects_controller.rb +9 -3

               before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
-              before_filter :require_admin, :only => [ :add, :copy, :archive, :unarchive, :destroy ]
+              before_filter :authorize_global, :only => :add
+              before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_key_auth :activity
               after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
+                    # Add current user as a project member if he is not admin
+                    unless User.current.admin?
+                      m = Member.new(:user => User.current, :roles => Role.builtin(false).find(:all, :order => 'position', :limit => 1))
+                      @project.members << m
+                    end
                     flash[:notice] = l(:notice_successful_create)
-                    redirect_to :controller => 'admin', :action => 'projects'
+                    redirect_to :controller => 'projects', :action => 'settings', :id => @project
-            	  end
+                  end
                 end
               end

0

app/models/user.rb +3 0

                   roles.detect {|role| (project.is_public? || role.member?) && role.allowed_to?(action)}
                 elsif options[:global]
+                  # Admin users are always authorized
+                  return true if admin?
                   # authorize if user has at least one role that has this permission
                   roles = memberships.collect {|m| m.roles}.flatten.uniq
                   roles.detect {|r| r.allowed_to?(action)} || (self.logged? ? Role.non_member.allowed_to?(action) : Role.anonymous.allowed_to?(action))

0

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

             <div class="contextual">
-                <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.admin? %>
+                <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
                 <%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> |
                 <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
             </div>

0

config/locales/bg.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/bs.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/ca.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/cs.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/da.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/de.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/en.yml +1 0

               setting_openid: Allow OpenID login and registration
               setting_password_min_length: Minimum password length
+              permission_add_project: Create project
               permission_edit_project: Edit project
               permission_select_project_modules: Select project modules
               permission_manage_members: Manage members

0

config/locales/es.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/fi.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/fr.yml +1 0

               setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
               setting_password_min_length: Longueur minimum des mots de passe
+              permission_add_project: Créer un projet
               permission_edit_project: Modifier le projet
               permission_select_project_modules: Choisir les modules
               permission_manage_members: Gérer les members

0

config/locales/gl.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/he.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/hu.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/it.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/ja.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/ko.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/lt.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/nl.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/no.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/pl.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/pt-BR.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/pt.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/ro.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/ru.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/sk.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/sl.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/sr.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/sv.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/th.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/tr.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/uk.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/vi.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/zh-TW.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

config/locales/zh.yml +1 0

               mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
               label_wiki_content_updated: Wiki page updated
               mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+              permission_add_project: Create project

0

lib/redmine.rb +1 0

             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
+              map.permission :add_project, {:projects => :add}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member_login]}, :require => :member

0

test/fixtures/roles.yml +1 0

               builtin: 0
               permissions: |
                 ---
+                - :add_project
                 - :edit_project
                 - :manage_members
                 - :manage_versions

0

test/functional/projects_controller_test.rb +50 0

@@ -89,6 +89,56 class ProjectsControllerTest < Test::Unit::TestCase
89	)	89	)
90	end	90	end
91		91
		92	def test_get_add
		93	@request.session[:user_id] = 1
		94	get :add
		95	assert_response :success
		96	assert_template 'add'
		97	end
		98
		99	def test_get_add_by_non_admin
		100	@request.session[:user_id] = 2
		101	get :add
		102	assert_response :success
		103	assert_template 'add'
		104	end
		105
		106	def test_post_add
		107	@request.session[:user_id] = 1
		108	post :add, :project => { :name => "blog",
		109	:description => "weblog",
		110	:identifier => "blog",
		111	:is_public => 1,
		112	:custom_field_values => { '3' => 'Beta' }
		113	}
		114	assert_redirected_to '/projects/blog/settings'
		115
		116	project = Project.find_by_name('blog')
		117	assert_kind_of Project, project
		118	assert_equal 'weblog', project.description
		119	assert_equal true, project.is_public?
		120	end
		121
		122	def test_post_add_by_non_admin
		123	@request.session[:user_id] = 2
		124	post :add, :project => { :name => "blog",
		125	:description => "weblog",
		126	:identifier => "blog",
		127	:is_public => 1,
		128	:custom_field_values => { '3' => 'Beta' }
		129	}
		130	assert_redirected_to '/projects/blog/settings'
		131
		132	project = Project.find_by_name('blog')
		133	assert_kind_of Project, project
		134	assert_equal 'weblog', project.description
		135	assert_equal true, project.is_public?
		136
		137	# User should be added as a project member
		138	assert User.find(2).member_of?(project)
		139	assert_equal 1, project.members.size
		140	end
		141
92	def test_show_routing	142	def test_show_routing
93	assert_routing(	143	assert_routing(
94	{:method => :get, :path => '/projects/test'},	144	{:method => :get, :path => '/projects/test'},

0

test/integration/admin_test.rb 0 -24

@@ -39,28 +39,4 class AdminTest < ActionController::IntegrationTest
39	locked_user = User.try_to_login("psmith", "psmith09")	39	locked_user = User.try_to_login("psmith", "psmith09")
40	assert_equal nil, locked_user	40	assert_equal nil, locked_user
41	end	41	end
42
43	def test_add_project
44	log_user("admin", "admin")
45	get "projects/new"
46	assert_response :success
47	assert_template "projects/add"
48	post "projects", :project => { :name => "blog",
49	:description => "weblog",
50	:identifier => "blog",
51	:is_public => 1,
52	:custom_field_values => { '3' => 'Beta' }
53	}
54	assert_redirected_to "admin/projects"
55	assert_equal 'Successful creation.', flash[:notice]
56
57	project = Project.find_by_name("blog")
58	assert_kind_of Project, project
59	assert_equal "weblog", project.description
60	assert_equal true, project.is_public?
61
62	get "admin/projects"
63	assert_response :success
64	assert_template "admin/projects"
65	end
66	end	42	end

	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