Commit 79b8bd0a authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

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
parent cf4e2165
...@@ -38,7 +38,7 @@ class IssueRelation < ActiveRecord::Base ...@@ -38,7 +38,7 @@ class IssueRelation < ActiveRecord::Base
def validate def validate
if issue_from && issue_to 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_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 errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
end end
end end
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
<p><label><%= l(:setting_issues_export_limit) %></label> <p><label><%= l(:setting_issues_export_limit) %></label>
<%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p> <%= 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> <p><label><%= l(:setting_mail_from) %></label>
<%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p> <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
......
...@@ -72,3 +72,5 @@ autologin: ...@@ -72,3 +72,5 @@ autologin:
date_format: date_format:
format: int format: int
default: 0 default: 0
cross_project_issue_relations:
default: 0
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Отбелязващи ключови думи ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Отбелязващи ключови думи
setting_commit_fix_keywords: Приключващи ключови думи setting_commit_fix_keywords: Приключващи ключови думи
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Потребител label_user: Потребител
label_user_plural: Потребители label_user_plural: Потребители
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Benutzer label_user: Benutzer
label_user_plural: Benutzer label_user_plural: Benutzer
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: User label_user: User
label_user_plural: Users label_user_plural: Users
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Usuario label_user: Usuario
label_user_plural: Usuarios label_user_plural: Usuarios
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Mot-clés de référencement ...@@ -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_commit_fix_keywords: Mot-clés de résolution
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Format de date 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: Utilisateur
label_user_plural: Utilisateurs label_user_plural: Utilisateurs
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Utente label_user: Utente
label_user_plural: Utenti label_user_plural: Utenti
......
...@@ -174,6 +174,7 @@ setting_commit_ref_keywords: 参照用キーワード ...@@ -174,6 +174,7 @@ setting_commit_ref_keywords: 参照用キーワード
setting_commit_fix_keywords: 修正用キーワード setting_commit_fix_keywords: 修正用キーワード
setting_autologin: 自動ログイン setting_autologin: 自動ログイン
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: ユーザ label_user: ユーザ
label_user_plural: ユーザ label_user_plural: ユーザ
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Gebruiker label_user: Gebruiker
label_user_plural: Gebruikers label_user_plural: Gebruikers
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Usuario label_user: Usuario
label_user_plural: Usuarios label_user_plural: Usuarios
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Palavras-chave de referôncia ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Palavras-chave de referôncia
setting_commit_fix_keywords: Palavras-chave fixas setting_commit_fix_keywords: Palavras-chave fixas
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Usuário label_user: Usuário
label_user_plural: Usuários label_user_plural: Usuários
......
...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -173,6 +173,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: Användare label_user: Användare
label_user_plural: Användare label_user_plural: Användare
......
...@@ -176,6 +176,7 @@ setting_commit_ref_keywords: Referencing keywords ...@@ -176,6 +176,7 @@ setting_commit_ref_keywords: Referencing keywords
setting_commit_fix_keywords: Fixing keywords setting_commit_fix_keywords: Fixing keywords
setting_autologin: Autologin setting_autologin: Autologin
setting_date_format: Date format setting_date_format: Date format
setting_cross_project_issue_relations: Allow cross-project issue relations
label_user: 用户 label_user: 用户
label_user_plural: 用户列表 label_user_plural: 用户列表
......
...@@ -566,12 +566,14 @@ margin: 0; ...@@ -566,12 +566,14 @@ margin: 0;
padding: 5px 0 8px 0; padding: 5px 0 8px 0;
padding-left: 180px; /*width of left column containing the label elements*/ padding-left: 180px; /*width of left column containing the label elements*/
height: 1%; height: 1%;
clear:both;
} }
.tabular label{ .tabular label{
font-weight: bold; font-weight: bold;
float: left; float: left;
margin-left: -180px; /*width of left column*/ 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 width: 175px; /*width of labels. Should be smaller than left column to create some right
margin*/ margin*/
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment