@@ -38,7 +38,7 class IssueRelation < ActiveRecord::Base | |||||
38 | def validate |
|
38 | def validate | |
39 | if issue_from && issue_to |
|
39 | if issue_from && issue_to | |
40 | errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id |
|
40 | errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id | |
41 | errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id |
|
41 | errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations? | |
42 | errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from |
|
42 | errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from | |
43 | end |
|
43 | end | |
44 | end |
|
44 | end |
@@ -24,6 +24,9 | |||||
24 | <p><label><%= l(:setting_issues_export_limit) %></label> |
|
24 | <p><label><%= l(:setting_issues_export_limit) %></label> | |
25 | <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p> |
|
25 | <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p> | |
26 |
|
26 | |||
|
27 | <p><label><%= l(:setting_cross_project_issue_relations) %></label> | |||
|
28 | <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p> | |||
|
29 | ||||
27 | <p><label><%= l(:setting_mail_from) %></label> |
|
30 | <p><label><%= l(:setting_mail_from) %></label> | |
28 | <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p> |
|
31 | <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p> | |
29 |
|
32 |
@@ -72,3 +72,5 autologin: | |||||
72 | date_format: |
|
72 | date_format: | |
73 | format: int |
|
73 | format: int | |
74 | default: 0 |
|
74 | default: 0 | |
|
75 | cross_project_issue_relations: | |||
|
76 | default: 0 |
@@ -173,6 +173,7 setting_commit_ref_keywords: Отбелязващи ключови думи | |||||
173 | setting_commit_fix_keywords: Приключващи ключови думи |
|
173 | setting_commit_fix_keywords: Приключващи ключови думи | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Потребител |
|
178 | label_user: Потребител | |
178 | label_user_plural: Потребители |
|
179 | label_user_plural: Потребители |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Benutzer |
|
178 | label_user: Benutzer | |
178 | label_user_plural: Benutzer |
|
179 | label_user_plural: Benutzer |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: User |
|
178 | label_user: User | |
178 | label_user_plural: Users |
|
179 | label_user_plural: Users |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Usuario |
|
178 | label_user: Usuario | |
178 | label_user_plural: Usuarios |
|
179 | label_user_plural: Usuarios |
@@ -173,6 +173,7 setting_commit_ref_keywords: Mot-clés de référencement | |||||
173 | setting_commit_fix_keywords: Mot-clés de résolution |
|
173 | setting_commit_fix_keywords: Mot-clés de résolution | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Format de date |
|
175 | setting_date_format: Format de date | |
|
176 | setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets | |||
176 |
|
177 | |||
177 | label_user: Utilisateur |
|
178 | label_user: Utilisateur | |
178 | label_user_plural: Utilisateurs |
|
179 | label_user_plural: Utilisateurs |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Utente |
|
178 | label_user: Utente | |
178 | label_user_plural: Utenti |
|
179 | label_user_plural: Utenti |
@@ -174,6 +174,7 setting_commit_ref_keywords: 参照用キーワード | |||||
174 | setting_commit_fix_keywords: 修正用キーワード |
|
174 | setting_commit_fix_keywords: 修正用キーワード | |
175 | setting_autologin: 自動ログイン |
|
175 | setting_autologin: 自動ログイン | |
176 | setting_date_format: Date format |
|
176 | setting_date_format: Date format | |
|
177 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
177 |
|
178 | |||
178 | label_user: ユーザ |
|
179 | label_user: ユーザ | |
179 | label_user_plural: ユーザ |
|
180 | label_user_plural: ユーザ |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Gebruiker |
|
178 | label_user: Gebruiker | |
178 | label_user_plural: Gebruikers |
|
179 | label_user_plural: Gebruikers |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Usuario |
|
178 | label_user: Usuario | |
178 | label_user_plural: Usuarios |
|
179 | label_user_plural: Usuarios |
@@ -173,6 +173,7 setting_commit_ref_keywords: Palavras-chave de referôncia | |||||
173 | setting_commit_fix_keywords: Palavras-chave fixas |
|
173 | setting_commit_fix_keywords: Palavras-chave fixas | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Usuário |
|
178 | label_user: Usuário | |
178 | label_user_plural: Usuários |
|
179 | label_user_plural: Usuários |
@@ -173,6 +173,7 setting_commit_ref_keywords: Referencing keywords | |||||
173 | setting_commit_fix_keywords: Fixing keywords |
|
173 | setting_commit_fix_keywords: Fixing keywords | |
174 | setting_autologin: Autologin |
|
174 | setting_autologin: Autologin | |
175 | setting_date_format: Date format |
|
175 | setting_date_format: Date format | |
|
176 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
176 |
|
177 | |||
177 | label_user: Användare |
|
178 | label_user: Användare | |
178 | label_user_plural: Användare |
|
179 | label_user_plural: Användare |
@@ -176,6 +176,7 setting_commit_ref_keywords: Referencing keywords | |||||
176 | setting_commit_fix_keywords: Fixing keywords |
|
176 | setting_commit_fix_keywords: Fixing keywords | |
177 | setting_autologin: Autologin |
|
177 | setting_autologin: Autologin | |
178 | setting_date_format: Date format |
|
178 | setting_date_format: Date format | |
|
179 | setting_cross_project_issue_relations: Allow cross-project issue relations | |||
179 |
|
180 | |||
180 | label_user: 用户 |
|
181 | label_user: 用户 | |
181 | label_user_plural: 用户列表 |
|
182 | label_user_plural: 用户列表 |
@@ -566,12 +566,14 margin: 0; | |||||
566 | padding: 5px 0 8px 0; |
|
566 | padding: 5px 0 8px 0; | |
567 | padding-left: 180px; /*width of left column containing the label elements*/ |
|
567 | padding-left: 180px; /*width of left column containing the label elements*/ | |
568 | height: 1%; |
|
568 | height: 1%; | |
|
569 | clear:both; | |||
569 | } |
|
570 | } | |
570 |
|
571 | |||
571 | .tabular label{ |
|
572 | .tabular label{ | |
572 | font-weight: bold; |
|
573 | font-weight: bold; | |
573 | float: left; |
|
574 | float: left; | |
574 | margin-left: -180px; /*width of left column*/ |
|
575 | margin-left: -180px; /*width of left column*/ | |
|
576 | margin-bottom: 10px; | |||
575 | width: 175px; /*width of labels. Should be smaller than left column to create some right |
|
577 | width: 175px; /*width of labels. Should be smaller than left column to create some right | |
576 | margin*/ |
|
578 | margin*/ | |
577 | } |
|
579 | } |
General Comments 0
You need to be logged in to leave comments.
Login now