jro_apps/redmine Commit - r4171:eea456ed84d1

0

app/controllers/application_controller.rb +12 -2

               # Authorize the user for the requested action
               def authorize(ctrl = params[:controller], action = params[:action], global = false)
                 allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
-                allowed ? true : deny_access
+                if allowed
+                  true
+                else
+                  if @project && @project.archived?
+                    render_403 :message => :notice_not_authorized_archived_project
+                  else
+                    deny_access
+                  end
+                end
               end
               # Authorize the user for the requested action outside a project
                 redirect_to default
               end
-              def render_403
+              def render_403(options={})
                 @project = nil
+                @message = options[:message] || :notice_not_authorized
+                @message = l(@message) if @message.is_a?(Symbol)
                 respond_to do |format|
                   format.html { render :template => "common/403", :layout => use_layout, :status => 403 }
                   format.atom { head 403 }

0

app/models/project.rb +4 0

                 self.status == STATUS_ACTIVE
               end
+              def archived?
+                self.status == STATUS_ARCHIVED
+              end
               # Archives the project and its descendants
               def archive
                 # Check that there is no issue of a non descendant project that is assigned

0

app/views/common/403.rhtml +1 -1

             <h2>403</h2>
-            <p><%= l(:notice_not_authorized) %></p>
+            <p><%=h @message %></p>
             <p><a href="javascript:history.back()">Back</a></p>
             <% html_title '403' %>

0

config/locales/bg.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/bs.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/ca.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/cs.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/da.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/de.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/el.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/en-GB.yml +1 0

               setting_default_notification_option: Default notification option
               label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
               label_user_mail_option_only_assigned: Only for things I am assigned to
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/en.yml +1 0

               notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
               notice_locking_conflict: Data has been updated by another user.
               notice_not_authorized: You are not authorized to access this page.
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.
               notice_email_sent: "An email was sent to {{value}}"
               notice_email_error: "An error occurred while sending mail ({{value}})"
               notice_feeds_access_key_reseted: Your RSS access key was reset.

0

config/locales/es.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/eu.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/fi.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/fr.yml +1 0

               notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
               notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
               notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
+              notice_not_authorized_archived_project: Le projet auquel vous tentez d'accéder a été archivé.
               notice_email_sent: "Un email a été envoyé à {{value}}"
               notice_email_error: "Erreur lors de l'envoi de l'email ({{value}})"
               notice_feeds_access_key_reseted: "Votre clé d'accès aux flux RSS a été réinitialisée."

0

config/locales/gl.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/he.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/hr.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/hu.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/id.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/it.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/ja.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/ko.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/lt.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/lv.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/mk.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/mn.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/nl.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/no.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/pl.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

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

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/pt.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/ro.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/ru.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/sk.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/sl.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/sr-YU.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/sr.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/sv.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/th.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/tr.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/uk.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/vi.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

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

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

config/locales/zh.yml +1 0

               label_user_mail_option_none: No events
               field_member_of_group: Assignee's group
               field_assigned_to_role: Assignee's role
+              notice_not_authorized_archived_project: The project you're trying to access has been archived.

0

test/functional/projects_controller_test.rb +10 0

@@ -296,6 +296,16 class ProjectsControllerTest < ActionController::TestCase
296	assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)	296	assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
297	end	297	end
298		298
		299	def show_archived_project_should_be_denied
		300	project = Project.find_by_identifier('ecookbook')
		301	project.archive!
		302
		303	get :show, :id => 'ecookbook'
		304	assert_response 403
		305	assert_nil assigns(:project)
		306	assert_tag :tag => 'p', :content => /archived/
		307	end
		308
299	def test_private_subprojects_hidden	309	def test_private_subprojects_hidden
300	get :show, :id => 'ecookbook'	310	get :show, :id => 'ecookbook'
301	assert_response :success	311	assert_response :success

0

test/unit/project_test.rb +2 0

                 @ecookbook.reload
                 assert !@ecookbook.active?
+                assert @ecookbook.archived?
                 assert !user.projects.include?(@ecookbook)
                 # Subproject are also archived
                 assert !@ecookbook.children.empty?
                 assert @ecookbook.unarchive
                 @ecookbook.reload
                 assert @ecookbook.active?
+                assert !@ecookbook.archived?
                 assert user.projects.include?(@ecookbook)
                 # Subproject can now be unarchived
                 @ecookbook_sub1.reload

	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