##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r3249 to r3252 and r3254 from trunk....
Jean-Philippe Lang -
r3141:a23399f220b3
parent child
Show More
Side by Side Unified
Context file:
r3141:a23399f220b3 Loading diff...:
Show file before | Show file after | Hide comments
@@ -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
Show file before | Show file after | Hide comments
@@ -57,6 +57,14 class Member < ActiveRecord::Base
57 member_roles.detect {|mr| mr.inherited_from}.nil?
57 member_roles.detect {|mr| mr.inherited_from}.nil?
58 end
58 end
59
59
60 def include?(user)
61 if principal.is_a?(Group)
62 !user.nil? && user.groups.include?(principal)
63 else
64 self.user == user
65 end
66 end
67
60 def before_destroy
68 def before_destroy
61 if user
69 if user
62 # remove category based auto assignments for this member
70 # remove category based auto assignments for this member
Show file before | Show file after | Hide comments
@@ -30,6 +30,10 class MemberRole < ActiveRecord::Base
30 errors.add :role_id, :invalid if role && !role.member?
30 errors.add :role_id, :invalid if role && !role.member?
31 end
31 end
32
32
33 def inherited?
34 !inherited_from.nil?
35 end
36
33 private
37 private
34
38
35 def remove_member_if_empty
39 def remove_member_if_empty
Show file before | Show file after | Hide comments
@@ -23,6 +23,7 class Project < ActiveRecord::Base
23 # Specific overidden Activities
23 # Specific overidden Activities
24 has_many :time_entry_activities
24 has_many :time_entry_activities
25 has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
25 has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
26 has_many :memberships, :class_name => 'Member'
26 has_many :member_principals, :class_name => 'Member',
27 has_many :member_principals, :class_name => 'Member',
27 :include => :principal,
28 :include => :principal,
28 :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
29 :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
@@ -583,10 +584,14 class Project < ActiveRecord::Base
583
584
584 # Copies members from +project+
585 # Copies members from +project+
585 def copy_members(project)
586 def copy_members(project)
586 project.members.each do |member|
587 project.memberships.each do |member|
587 new_member = Member.new
588 new_member = Member.new
588 new_member.attributes = member.attributes.dup.except("id", "project_id", "created_on")
589 new_member.attributes = member.attributes.dup.except("id", "project_id", "created_on")
589 new_member.role_ids = member.role_ids.dup
590 # only copy non inherited roles
591 # inherited roles will be added when copying the group membership
592 role_ids = member.member_roles.reject(&:inherited?).collect(&:role_id)
593 next if role_ids.empty?
594 new_member.role_ids = role_ids
590 new_member.project = self
595 new_member.project = self
591 self.members << new_member
596 self.members << new_member
592 end
597 end
Show file before | Show file after | Hide comments
@@ -35,7 +35,8
35 <td class="buttons">
35 <td class="buttons">
36 <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
36 <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
37 <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
37 <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
38 :method => :post
38 :method => :post,
39 :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
39 }, :title => l(:button_delete),
40 }, :title => l(:button_delete),
40 :class => 'icon icon-del') if member.deletable? %>
41 :class => 'icon icon-del') if member.deletable? %>
41 </td>
42 </td>
Show file before | Show file after | Hide comments
@@ -869,3 +869,6 bg:
869 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
869 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
870 permission_add_subprojects: Create subprojects
870 permission_add_subprojects: Create subprojects
871 label_subproject_new: New subproject
871 label_subproject_new: New subproject
872 text_own_membership_delete_confirmation: |-
873 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
874 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -893,3 +893,6 bs:
893 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
893 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
894 permission_add_subprojects: Create subprojects
894 permission_add_subprojects: Create subprojects
895 label_subproject_new: New subproject
895 label_subproject_new: New subproject
896 text_own_membership_delete_confirmation: |-
897 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
898 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -872,3 +872,6 ca:
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
873 permission_add_subprojects: Create subprojects
873 permission_add_subprojects: Create subprojects
874 label_subproject_new: New subproject
874 label_subproject_new: New subproject
875 text_own_membership_delete_confirmation: |-
876 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
877 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -875,3 +875,6 cs:
875 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
875 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
876 permission_add_subprojects: Create subprojects
876 permission_add_subprojects: Create subprojects
877 label_subproject_new: New subproject
877 label_subproject_new: New subproject
878 text_own_membership_delete_confirmation: |-
879 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
880 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -895,3 +895,6 da:
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
896 permission_add_subprojects: Create subprojects
896 permission_add_subprojects: Create subprojects
897 label_subproject_new: New subproject
897 label_subproject_new: New subproject
898 text_own_membership_delete_confirmation: |-
899 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
900 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -895,3 +895,6 de:
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
896 permission_add_subprojects: Create subprojects
896 permission_add_subprojects: Create subprojects
897 label_subproject_new: New subproject
897 label_subproject_new: New subproject
898 text_own_membership_delete_confirmation: |-
899 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
900 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -875,3 +875,6 el:
875 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
875 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
876 permission_add_subprojects: Create subprojects
876 permission_add_subprojects: Create subprojects
877 label_subproject_new: New subproject
877 label_subproject_new: New subproject
878 text_own_membership_delete_confirmation: |-
879 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
880 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -848,6 +848,7 en:
848 text_wiki_page_nullify_children: "Keep child pages as root pages"
848 text_wiki_page_nullify_children: "Keep child pages as root pages"
849 text_wiki_page_destroy_children: "Delete child pages and all their descendants"
849 text_wiki_page_destroy_children: "Delete child pages and all their descendants"
850 text_wiki_page_reassign_children: "Reassign child pages to this parent page"
850 text_wiki_page_reassign_children: "Reassign child pages to this parent page"
851 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?"
851
852
852 default_role_manager: Manager
853 default_role_manager: Manager
853 default_role_developper: Developer
854 default_role_developper: Developer
Show file before | Show file after | Hide comments
@@ -919,3 +919,6 es:
919 setting_mail_handler_body_delimiters: Truncar correos tras una de estas lΓ­neas
919 setting_mail_handler_body_delimiters: Truncar correos tras una de estas lΓ­neas
920 permission_add_subprojects: Create subprojects
920 permission_add_subprojects: Create subprojects
921 label_subproject_new: New subproject
921 label_subproject_new: New subproject
922 text_own_membership_delete_confirmation: |-
923 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
924 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -905,3 +905,6 fi:
905 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
905 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
906 permission_add_subprojects: Create subprojects
906 permission_add_subprojects: Create subprojects
907 label_subproject_new: New subproject
907 label_subproject_new: New subproject
908 text_own_membership_delete_confirmation: |-
909 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
910 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -856,6 +856,7 fr:
856 text_wiki_page_nullify_children: "Conserver les sous-pages en tant que pages racines"
856 text_wiki_page_nullify_children: "Conserver les sous-pages en tant que pages racines"
857 text_wiki_page_destroy_children: "Supprimer les sous-pages et toutes leurs descedantes"
857 text_wiki_page_destroy_children: "Supprimer les sous-pages et toutes leurs descedantes"
858 text_wiki_page_reassign_children: "RΓ©affecter les sous-pages Γ  cette page"
858 text_wiki_page_reassign_children: "RΓ©affecter les sous-pages Γ  cette page"
859 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 ?"
859
860
860 default_role_manager: Manager
861 default_role_manager: Manager
861 default_role_developper: DΓ©veloppeur
862 default_role_developper: DΓ©veloppeur
Show file before | Show file after | Hide comments
@@ -895,3 +895,6 gl:
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
895 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
896 permission_add_subprojects: Create subprojects
896 permission_add_subprojects: Create subprojects
897 label_subproject_new: New subproject
897 label_subproject_new: New subproject
898 text_own_membership_delete_confirmation: |-
899 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
900 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -879,3 +879,6 he:
879 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
879 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
880 permission_add_subprojects: Create subprojects
880 permission_add_subprojects: Create subprojects
881 label_subproject_new: New subproject
881 label_subproject_new: New subproject
882 text_own_membership_delete_confirmation: |-
883 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
884 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -900,3 +900,6
900 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
900 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
901 permission_add_subprojects: Create subprojects
901 permission_add_subprojects: Create subprojects
902 label_subproject_new: New subproject
902 label_subproject_new: New subproject
903 text_own_membership_delete_confirmation: |-
904 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
905 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -887,3 +887,6 id:
887 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
887 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
888 permission_add_subprojects: Create subprojects
888 permission_add_subprojects: Create subprojects
889 label_subproject_new: New subproject
889 label_subproject_new: New subproject
890 text_own_membership_delete_confirmation: |-
891 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
892 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -882,3 +882,6 it:
882 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
882 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
883 permission_add_subprojects: Create subprojects
883 permission_add_subprojects: Create subprojects
884 label_subproject_new: New subproject
884 label_subproject_new: New subproject
885 text_own_membership_delete_confirmation: |-
886 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
887 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -904,3 +904,6 ja:
904 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
904 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
905 permission_add_subprojects: Create subprojects
905 permission_add_subprojects: Create subprojects
906 label_subproject_new: New subproject
906 label_subproject_new: New subproject
907 text_own_membership_delete_confirmation: |-
908 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
909 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -935,3 +935,6 ko:
935 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
935 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
936 permission_add_subprojects: Create subprojects
936 permission_add_subprojects: Create subprojects
937 label_subproject_new: New subproject
937 label_subproject_new: New subproject
938 text_own_membership_delete_confirmation: |-
939 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
940 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -943,3 +943,6 lt:
943 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
943 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
944 permission_add_subprojects: Create subprojects
944 permission_add_subprojects: Create subprojects
945 label_subproject_new: New subproject
945 label_subproject_new: New subproject
946 text_own_membership_delete_confirmation: |-
947 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
948 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -857,3 +857,6 nl:
857 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
857 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
858 permission_add_subprojects: Create subprojects
858 permission_add_subprojects: Create subprojects
859 label_subproject_new: New subproject
859 label_subproject_new: New subproject
860 text_own_membership_delete_confirmation: |-
861 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
862 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -870,3 +870,6
870 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
870 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
871 permission_add_subprojects: Create subprojects
871 permission_add_subprojects: Create subprojects
872 label_subproject_new: New subproject
872 label_subproject_new: New subproject
873 text_own_membership_delete_confirmation: |-
874 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
875 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -898,3 +898,6 pl:
898 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
898 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
899 permission_add_subprojects: Create subprojects
899 permission_add_subprojects: Create subprojects
900 label_subproject_new: New subproject
900 label_subproject_new: New subproject
901 text_own_membership_delete_confirmation: |-
902 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
903 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -902,3 +902,6 pt-BR:
902 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
902 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
903 permission_add_subprojects: Create subprojects
903 permission_add_subprojects: Create subprojects
904 label_subproject_new: New subproject
904 label_subproject_new: New subproject
905 text_own_membership_delete_confirmation: |-
906 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
907 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -887,3 +887,6 pt:
887 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
887 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
888 permission_add_subprojects: Create subprojects
888 permission_add_subprojects: Create subprojects
889 label_subproject_new: New subproject
889 label_subproject_new: New subproject
890 text_own_membership_delete_confirmation: |-
891 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
892 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -872,3 +872,6 ro:
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
873 permission_add_subprojects: Create subprojects
873 permission_add_subprojects: Create subprojects
874 label_subproject_new: New subproject
874 label_subproject_new: New subproject
875 text_own_membership_delete_confirmation: |-
876 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
877 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -983,3 +983,6 ru:
983 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
983 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
984 permission_add_subprojects: Create subprojects
984 permission_add_subprojects: Create subprojects
985 label_subproject_new: New subproject
985 label_subproject_new: New subproject
986 text_own_membership_delete_confirmation: |-
987 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
988 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -874,3 +874,6 sk:
874 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
874 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
875 permission_add_subprojects: Create subprojects
875 permission_add_subprojects: Create subprojects
876 label_subproject_new: New subproject
876 label_subproject_new: New subproject
877 text_own_membership_delete_confirmation: |-
878 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
879 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -871,3 +871,6 sl:
871 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
871 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
872 permission_add_subprojects: Create subprojects
872 permission_add_subprojects: Create subprojects
873 label_subproject_new: New subproject
873 label_subproject_new: New subproject
874 text_own_membership_delete_confirmation: |-
875 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
876 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -890,3 +890,6
890 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
890 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
891 permission_add_subprojects: Create subprojects
891 permission_add_subprojects: Create subprojects
892 label_subproject_new: New subproject
892 label_subproject_new: New subproject
893 text_own_membership_delete_confirmation: |-
894 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
895 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -925,3 +925,6 sv:
925 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
925 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
926 permission_add_subprojects: Create subprojects
926 permission_add_subprojects: Create subprojects
927 label_subproject_new: New subproject
927 label_subproject_new: New subproject
928 text_own_membership_delete_confirmation: |-
929 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
930 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -872,3 +872,6 th:
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
872 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
873 permission_add_subprojects: Create subprojects
873 permission_add_subprojects: Create subprojects
874 label_subproject_new: New subproject
874 label_subproject_new: New subproject
875 text_own_membership_delete_confirmation: |-
876 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
877 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -902,3 +902,6 tr:
902 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
902 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
903 permission_add_subprojects: Create subprojects
903 permission_add_subprojects: Create subprojects
904 label_subproject_new: New subproject
904 label_subproject_new: New subproject
905 text_own_membership_delete_confirmation: |-
906 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
907 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -871,3 +871,6 uk:
871 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
871 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
872 permission_add_subprojects: Create subprojects
872 permission_add_subprojects: Create subprojects
873 label_subproject_new: New subproject
873 label_subproject_new: New subproject
874 text_own_membership_delete_confirmation: |-
875 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
876 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -934,3 +934,6 vi:
934 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
934 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
935 permission_add_subprojects: Create subprojects
935 permission_add_subprojects: Create subprojects
936 label_subproject_new: New subproject
936 label_subproject_new: New subproject
937 text_own_membership_delete_confirmation: |-
938 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
939 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -968,3 +968,6
968 enumeration_system_activity: η³»η΅±ζ΄»ε‹•
968 enumeration_system_activity: η³»η΅±ζ΄»ε‹•
969 permission_add_subprojects: Create subprojects
969 permission_add_subprojects: Create subprojects
970 label_subproject_new: New subproject
970 label_subproject_new: New subproject
971 text_own_membership_delete_confirmation: |-
972 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
973 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -899,3 +899,6 zh:
899 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
899 setting_mail_handler_body_delimiters: Truncate emails after one of these lines
900 permission_add_subprojects: Create subprojects
900 permission_add_subprojects: Create subprojects
901 label_subproject_new: New subproject
901 label_subproject_new: New subproject
902 text_own_membership_delete_confirmation: |-
903 You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
904 Are you sure you want to continue?
Show file before | Show file after | Hide comments
@@ -182,7 +182,7 module Redmine
182 end
182 end
183
183
184 def self.shellout(cmd, &block)
184 def self.shellout(cmd, &block)
185 logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
185 logger.debug "Shelling out: #{strip_credential(cmd)}" if logger && logger.debug?
186 if Rails.env == 'development'
186 if Rails.env == 'development'
187 # Capture stderr when running in dev environment
187 # Capture stderr when running in dev environment
188 cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"
188 cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"
Show file before | Show file after | Hide comments
@@ -190,7 +190,7 Calendar.setup = function (params) {
190 cal.create();
190 cal.create();
191 cal.refresh();
191 cal.refresh();
192 if (!params.position)
192 if (!params.position)
193 cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
193 cal.showAtElement(params.button || params.displayArea || params.inputField);
194 else
194 else
195 cal.showAt(params.position[0], params.position[1]);
195 cal.showAt(params.position[0], params.position[1]);
196 return false;
196 return false;
Show file before | Show file after | Hide comments
@@ -2,4 +2,7
2 groups_users_001:
2 groups_users_001:
3 group_id: 10
3 group_id: 10
4 user_id: 8
4 user_id: 8
5 groups_users_002:
6 group_id: 11
7 user_id: 8
5 No newline at end of file
8
Show file before | Show file after | Hide comments
@@ -37,3 +37,13 member_roles_009:
37 role_id: 2
37 role_id: 2
38 member_id: 7
38 member_id: 7
39 inherited_from: 7
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
Show file before | Show file after | Hide comments
@@ -48,3 +48,15 members_008:
48 id: 8
48 id: 8
49 user_id: 1
49 user_id: 1
50 mail_notification: true
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
Show file before | Show file after | Hide comments
@@ -633,15 +633,15 class ProjectTest < ActiveSupport::TestCase
633 assert_not_equal source_relation_cross_project.id, copied_relation.id
633 assert_not_equal source_relation_cross_project.id, copied_relation.id
634 end
634 end
635
635
636 should "copy members" do
636 should "copy memberships" do
637 assert @project.valid?
637 assert @project.valid?
638 assert @project.members.empty?
638 assert @project.members.empty?
639 assert @project.copy(@source_project)
639 assert @project.copy(@source_project)
640
640
641 assert_equal @source_project.members.size, @project.members.size
641 assert_equal @source_project.memberships.size, @project.memberships.size
642 @project.members.each do |member|
642 @project.memberships.each do |membership|
643 assert member
643 assert membership
644 assert_equal @project, member.project
644 assert_equal @project, membership.project
645 end
645 end
646 end
646 end
647
647
Show file before | Show file after | Hide comments
@@ -77,4 +77,12 class WikiContentTest < ActiveSupport::TestCase
77 assert_kind_of String, version.text
77 assert_kind_of String, version.text
78 end
78 end
79 end
79 end
80
81 def test_large_text_should_not_be_truncated_to_64k
82 page = WikiPage.new(:wiki => @wiki, :title => "Big page")
83 page.content = WikiContent.new(:text => "a" * 500.kilobyte, :author => User.find(1))
84 assert page.save
85 page.reload
86 assert_equal 500.kilobyte, page.content.text.size
87 end
80 end
88 end
General Comments 0
You need to be logged in to leave comments. Login now