jro_apps/redmine Commit - r3141:a23399f220b3

0

db/migrate/20091227112908_change_wiki_contents_text_limit.rb created 644 +16 0

			@@ -0,0 +1,16
		1	class ChangeWikiContentsTextLimit < ActiveRecord::Migration
		2	def self.up
		3	# Migrates MySQL databases only
		4	# Postgres would raise an error (see http://dev.rubyonrails.org/ticket/3818)
		5	# Not fixed in Rails 2.3.5
		6	if ActiveRecord::Base.connection.adapter_name =~ /mysql/i
		7	max_size = 16.megabytes
		8	change_column :wiki_contents, :text, :text, :limit => max_size
		9	change_column :wiki_content_versions, :data, :binary, :limit => max_size
		10	end
		11	end
		12
		13	def self.down
		14	# no-op
		15	end
		16	end

0

app/models/member.rb +8 0

                  member_roles.detect {|mr| mr.inherited_from}.nil?
                end
+               def include?(user)
+                 if principal.is_a?(Group)
+                   !user.nil? && user.groups.include?(principal)
+                 else
+                   self.user == user
+                 end
+               end
                def before_destroy
                  if user
                    # remove category based auto assignments for this member

0

app/models/member_role.rb +4 0

                  errors.add :role_id, :invalid if role && !role.member?
                end
+               def inherited?
+                 !inherited_from.nil?
+               end
                private
                def remove_member_if_empty

0

app/models/project.rb +7 -2

                # Specific overidden Activities
                has_many :time_entry_activities
                has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
+               has_many :memberships, :class_name => 'Member'
                has_many :member_principals, :class_name => 'Member',
                                             :include => :principal,
                                             :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
                # Copies members from +project+
                def copy_members(project)
-                 project.members.each do |member|
+                 project.memberships.each do |member|
                    new_member = Member.new
                    new_member.attributes = member.attributes.dup.except("id", "project_id", "created_on")
-                   new_member.role_ids = member.role_ids.dup
+                   # only copy non inherited roles
+                   # inherited roles will be added when copying the group membership
+                   role_ids = member.member_roles.reject(&:inherited?).collect(&:role_id)
+                   next if role_ids.empty?
+                   new_member.role_ids = role_ids
                    new_member.project = self
                    self.members << new_member
                  end

0

app/views/projects/settings/_members.rhtml +2 -1

                <td class="buttons">
                    <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
                    <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
-                                                           :method => :post
+                                                           :method => :post,
+                                                           :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
                                                          }, :title => l(:button_delete),
                                                             :class => 'icon icon-del') if member.deletable? %>
                </td>

0

config/locales/bg.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/bs.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/ca.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/cs.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/da.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/de.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/el.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/en.yml +1 0

                text_wiki_page_nullify_children: "Keep child pages as root pages"
                text_wiki_page_destroy_children: "Delete child pages and all their descendants"
                text_wiki_page_reassign_children: "Reassign child pages to this parent page"
+               text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
                default_role_manager: Manager
                default_role_developper: Developer

0

config/locales/es.yml +3 0

                setting_mail_handler_body_delimiters: Truncar correos tras una de estas líneas
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/fi.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/fr.yml +1 0

                text_wiki_page_nullify_children: "Conserver les sous-pages en tant que pages racines"
                text_wiki_page_destroy_children: "Supprimer les sous-pages et toutes leurs descedantes"
                text_wiki_page_reassign_children: "Réaffecter les sous-pages à cette page"
+               text_own_membership_delete_confirmation: "Vous allez supprimer tout ou partie de vos permissions sur ce projet et ne serez peut-être plus autorisé à modifier ce projet.\nEtes-vous sûr de vouloir continuer ?"
                default_role_manager: Manager
                default_role_developper: Développeur

0

config/locales/gl.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/he.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/hu.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/id.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/it.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/ja.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/ko.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/lt.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/nl.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/no.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/pl.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

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

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/pt.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/ro.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/ru.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/sk.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/sl.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/sr.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/sv.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/th.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/tr.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/uk.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/vi.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

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

                enumeration_system_activity: 系統活動
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

config/locales/zh.yml +3 0

                setting_mail_handler_body_delimiters: Truncate emails after one of these lines
                permission_add_subprojects: Create subprojects
                label_subproject_new: New subproject
+               text_own_membership_delete_confirmation: |-
+                 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+                 Are you sure you want to continue?

0

lib/redmine/scm/adapters/abstract_adapter.rb +1 -1

                      end
                      def self.shellout(cmd, &block)
-                       logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
+                       logger.debug "Shelling out: #{strip_credential(cmd)}" if logger && logger.debug?
                        if Rails.env == 'development'
                          # Capture stderr when running in dev environment
                          cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"

0

public/javascripts/calendar/calendar-setup.js +1 -1

              			cal.create();
              		cal.refresh();
              		if (!params.position)
-             			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+             			cal.showAtElement(params.button || params.displayArea || params.inputField);
              		else
              			cal.showAt(params.position[0], params.position[1]);
              		return false;

0

test/fixtures/groups_users.yml +3 0

              groups_users_001:
                group_id: 10
                user_id: 8
+             groups_users_002:
+               group_id: 11
+               user_id: 8
   No newline at end of file

0

test/fixtures/member_roles.yml +10 0

		@@ -37,3 +37,13 member_roles_009:
37	37	role_id: 2
38	38	member_id: 7
39	39	inherited_from: 7
	40	member_roles_010:
	41	id: 10
	42	role_id: 2
	43	member_id: 9
	44	inherited_from:
	45	member_roles_011:
	46	id: 11
	47	role_id: 2
	48	member_id: 10
	49	inherited_from: 10

0

test/fixtures/members.yml +12 0

		@@ -48,3 +48,15 members_008:
48	48	id: 8
49	49	user_id: 1
50	50	mail_notification: true
	51	members_009:
	52	id: 9
	53	created_on: 2006-07-19 19:35:33 +02:00
	54	project_id: 2
	55	user_id: 11
	56	mail_notification: false
	57	members_010:
	58	id: 10
	59	created_on: 2006-07-19 19:35:33 +02:00
	60	project_id: 2
	61	user_id: 8
	62	mail_notification: false

0

test/unit/project_test.rb +5 -5

                    assert_not_equal source_relation_cross_project.id, copied_relation.id
                  end
-                 should "copy members" do
+                 should "copy memberships" do
                    assert @project.valid?
                    assert @project.members.empty?
                    assert @project.copy(@source_project)
-                   assert_equal @source_project.members.size, @project.members.size
-                   @project.members.each do |member|
-                     assert member
-                     assert_equal @project, member.project
+                   assert_equal @source_project.memberships.size, @project.memberships.size
+                   @project.memberships.each do |membership|
+                     assert membership
+                     assert_equal @project, membership.project
                    end
                  end

0

test/unit/wiki_content_test.rb +8 0

                    assert_kind_of String, version.text
                  end
                end
+               def test_large_text_should_not_be_truncated_to_64k
+                 page = WikiPage.new(:wiki => @wiki, :title => "Big page")
+                 page.content = WikiContent.new(:text => "a" * 500.kilobyte, :author => User.find(1))
+                 assert page.save
+                 page.reload
+                 assert_equal 500.kilobyte, page.content.text.size
+               end
              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