Added an option to be able to relate issues in different projects.

It can be set in Admin -> Settings (default: false).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@620 e93f8b46-1217-0410-a6f0-8f06a7374b81

16 files changed, 20 insertions, 1 deletions

diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb
index 05ea52057..07e940b85 100644
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -38,7 +38,7 @@ class IssueRelation < ActiveRecord::Base
   def validate
     if issue_from && issue_to
       errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id
-      errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id
+      errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations?
       errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
     end
   end
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 086484935..3ae96e3c2 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -24,6 +24,9 @@
 <p><label><%= l(:setting_issues_export_limit) %></label>
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 
+<p><label><%= l(:setting_cross_project_issue_relations) %></label>
+<%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
+
 <p><label><%= l(:setting_mail_from) %></label>
 <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
 
diff --git a/config/settings.yml b/config/settings.yml
index 924f0d3b2..b5999eac6 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -72,3 +72,5 @@ autologin:
 date_format:

   format: int

   default: 0

+cross_project_issue_relations:

+  default: 0

diff --git a/lang/bg.yml b/lang/bg.yml
index 4daf691e8..3afcc54fd 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Отбелязващи ключови думи
 setting_commit_fix_keywords: Приключващи ключови думи
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Потребител
 label_user_plural: Потребители
diff --git a/lang/de.yml b/lang/de.yml
index cd8b82b17..9c59a1d58 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Benutzer
 label_user_plural: Benutzer
diff --git a/lang/en.yml b/lang/en.yml
index d1e45fcc0..c144ab48d 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: User
 label_user_plural: Users
diff --git a/lang/es.yml b/lang/es.yml
index e2fa8ad5c..a494fdfa9 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Usuario
 label_user_plural: Usuarios
diff --git a/lang/fr.yml b/lang/fr.yml
index 4c679bb6e..e0b66692a 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Mot-clés de référencement
 setting_commit_fix_keywords: Mot-clés de résolution
 setting_autologin: Autologin
 setting_date_format: Format de date
+setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs
diff --git a/lang/it.yml b/lang/it.yml
index f674a4728..5cc81a678 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Utente
 label_user_plural: Utenti
diff --git a/lang/ja.yml b/lang/ja.yml
index 4495c0a52..34a1bbec4 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -174,6 +174,7 @@ setting_commit_ref_keywords: 参照用キーワード
 setting_commit_fix_keywords: 修正用キーワード
 setting_autologin: 自動ログイン
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: ユーザ
 label_user_plural: ユーザ
diff --git a/lang/nl.yml b/lang/nl.yml
index bb753f978..99ea5b3a6 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Gebruiker
 label_user_plural: Gebruikers
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index b1505f267..6043c8bc0 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords

 setting_autologin: Autologin

 setting_date_format: Date format

+setting_cross_project_issue_relations: Allow cross-project issue relations

 

 label_user: Usuario

 label_user_plural: Usuarios

diff --git a/lang/pt.yml b/lang/pt.yml
index 4c0729716..6b137cde8 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Palavras-chave de referôncia
 setting_commit_fix_keywords: Palavras-chave fixas
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Usuário
 label_user_plural: Usuários
diff --git a/lang/sv.yml b/lang/sv.yml
index eb10f95ea..8f4824018 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: Användare
 label_user_plural: Användare
diff --git a/lang/zh.yml b/lang/zh.yml
index fa58056b6..043aad1e1 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -176,6 +176,7 @@ setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
 setting_autologin: Autologin
 setting_date_format: Date format
+setting_cross_project_issue_relations: Allow cross-project issue relations
 
 label_user: 用户
 label_user_plural: 用户列表
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fec62b92c..9f43b53c6 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -566,12 +566,14 @@ margin: 0;
 padding: 5px 0 8px 0;
 padding-left: 180px; /*width of left column containing the label elements*/
 height: 1%;
+clear:both;
 }
 
 .tabular label{
 font-weight: bold;
 float: left;
 margin-left: -180px; /*width of left column*/
+margin-bottom: 10px;
 width: 175px; /*width of labels. Should be smaller than left column to create some right 
 margin*/
 }