diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-06 10:28:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-06 10:28:20 +0000 |
| commit | 5f8e9d71182040473d4072241ce81fcadada497f (patch) | |
| tree | 7701b9fed7aed50afd4dbf7fd34ec5ef08d40e5f /app/views/issues | |
| parent | e1781235696fe23851154ebbdc913e970d3c0f3a (diff) | |
| download | redmine-5f8e9d71182040473d4072241ce81fcadada497f.tar.gz redmine-5f8e9d71182040473d4072241ce81fcadada497f.zip | |
Version sharing (#465) + optional inclusion of subprojects in the roadmap view (#2666).
Each version of a project can be shared with:
* subprojects
* projects in the project hierarchy: ancestors + descendants (needs versions management permission on the root project)
* projects in the project tree: root project + all its descendants (same as above)
* all projects (can be set by admin users only)
Notes:
* when sharing a version of a private project with others projects, its name will be visible within the other projects
* a project with versions used by non descendant projects can not be archived
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3123 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_attributes.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/context_menu.rhtml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml index b27c56245..b9d17ac81 100644 --- a/app/views/issues/_attributes.rhtml +++ b/app/views/issues/_attributes.rhtml @@ -19,7 +19,7 @@ :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p> <% end %> <% unless @issue.assignable_versions.empty? %> -<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p> +<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %></p> <% end %> </div> diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml index de82e18ce..f428566b2 100644 --- a/app/views/issues/bulk_edit.rhtml +++ b/app/views/issues/bulk_edit.rhtml @@ -31,7 +31,7 @@ <label><%= l(:field_fixed_version) %>: <%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + - options_from_collection_for_select(@project.versions.open.sort, :id, :name)) %></label> + version_options_for_select(@project.shared_versions.open)) %></label> </p> <p> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index c67c1bcd5..e408e3b70 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -38,12 +38,12 @@ <% end -%> </ul> </li> - <% unless @project.nil? || @project.versions.open.empty? -%> + <% unless @project.nil? || @project.shared_versions.open.empty? -%> <li class="folder"> <a href="#" class="submenu"><%= l(:field_fixed_version) %></a> <ul> - <% @project.versions.open.sort.each do |v| -%> - <li><%= context_menu_link v.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => v, :back_to => @back}, :method => :post, + <% @project.shared_versions.open.sort.each do |v| -%> + <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => v, :back_to => @back}, :method => :post, :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li> <% end -%> <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => 'none', :back_to => @back}, :method => :post, |