0001-Allow-normal-users-to-delete-a-project.patch - Redmine

       menu_item :projects, :only => [:index, :new, :copy, :create]
       before_action :find_project, :except => [ :index, :autocomplete, :list, :new, :create, :copy ]
       before_action :authorize, :except => [ :index, :autocomplete, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
       before_action :authorize, :except => [ :index, :autocomplete, :list, :new, :create, :copy, :archive, :unarchive]
       before_action :authorize_global, :only => [:new, :create]
       before_action :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
       before_action :require_admin, :only => [ :copy, :archive, :unarchive ]
       accept_rss_auth :index
       accept_api_auth :index, :show, :create, :update, :destroy
       require_sudo_mode :destroy
-...
       # Delete @project
       def destroy
         unless @project.deletable?
           deny_access
           return
         end
         @project_to_destroy = @project
         if api_request? || params[:confirm]
           @project_to_destroy.destroy
           respond_to do |format|
             format.html { redirect_to admin_projects_path }
             format.html { redirect_to User.current.admin? ? admin_projects_path : projects_path }
             format.api  { render_api_ok }
           end
         end

         end
       end
       def deletable?(user = User.current)
         if user.admin?
           return true
         else
           user.allowed_to?(:delete_project, self) && leaf?
         end
       end
       # Return the enabled module with the given name
       # or nil if the module is not enabled for the project
       def enabled_module(name)

app/views/projects/destroy.html.erb
19	19
20	20	<p>
21	21	<%= submit_tag l(:button_delete) %>
22		<%= link_to l(:button_cancel), :controller => 'admin', :action => 'projects' %>
	22	<%= link_to l(:button_cancel), User.current.admin? ? admin_projects_path : projects_path %>
23	23	</p>
24	24	<% end %>

           <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
         <% end %>
       <% end %>
       <% if @project.deletable? %>
         <%= link_to l(:button_delete), project_path(@project), :method => :delete, :class => 'icon icon-del' %>
       <% end %>
       <%= link_to_if_authorized l(:label_settings),
                   {:controller => 'projects', :action => 'settings', :id => @project},
                   :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>

config/locales/de.yml
917	917	permission_delete_issues: Tickets löschen
918	918	permission_delete_messages: Forenbeiträge löschen
919	919	permission_delete_own_messages: Eigene Forenbeiträge löschen
	920	permission_delete_project: Projekt löschen
920	921	permission_delete_wiki_pages: Wiki-Seiten löschen
921	922	permission_delete_wiki_pages_attachments: Anhänge löschen
922	923	permission_delete_documents: Dokumente löschen

config/locales/en.yml
500	500	permission_add_subprojects: Create subprojects
501	501	permission_edit_project: Edit project
502	502	permission_close_project: Close / reopen the project
	503	permission_delete_project: Delete the project
503	504	permission_select_project_modules: Select project modules
504	505	permission_manage_members: Manage members
505	506	permission_manage_project_activities: Manage project activities

lib/redmine.rb
84	84	map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
85	85	map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
86	86	map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
	87	map.permission :delete_project, {:projects => :destroy}, :require => :member
87	88	map.permission :select_project_modules, {:projects => :modules}, :require => :member
88	89	map.permission :view_members, {:members => [:index, :show]}, :public => true, :read => true
89	90	map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :new, :create, :edit, :update, :destroy, :autocomplete]}, :require => :member

         - :add_project
         - :edit_project
         - :close_project
         - :delete_project
         - :select_project_modules
         - :manage_members
         - :manage_versions
-...
       permissions: |
         ---
         - :edit_project
         - :delete_project
         - :manage_members
         - :manage_versions
         - :manage_categories

         assert_nil Project.find_by_id(1)
       end
       def test_destroy_with_normal_user_should_destroy
         set_tmp_attachments_directory
         @request.session[:user_id] = 2 # non-admin
         assert_difference 'Project.count', -1 do
           delete(
             :destroy,
             :params => {
               :id => 2,
               :confirm => 1
+            }
+          )
           assert_redirected_to '/projects'
         end
         assert_nil Project.find_by_id(2)
       end
       def test_destroy_with_normal_user_should_not_destroy_with_subprojects
         set_tmp_attachments_directory
         @request.session[:user_id] = 2 # non-admin
         assert_difference 'Project.count', 0 do
           delete(
             :destroy,
             :params => {
               :id => 1,
               :confirm => 1
+            }
+          )
           assert_response 403
         end
         assert Project.find(1)
       end
       def test_archive
         @request.session[:user_id] = 1 # admin
         post(:archive, :params => {:id => 1})

Redmine