jro_apps/redmine Commit - r6049:7d658e1477fc

Adds a 'New version' link on the roadmap....

Jean-Philippe Lang -

r6049:7d658e1477fc

parent child

Context file:

r6049:7d658e1477fc

Collapse all files

app/controllers/versions_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class VersionsController < ApplicationController
               menu_item :roadmap
               model_object Version
               before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
               before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
               before_filter :find_project, :only => [:index, :new, :create, :close_completed]
               before_filter :authorize
               helper :custom_fields
               helper :projects
               def index
                 @trackers = @project.trackers.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                 @versions = @project.shared_versions || []
                 @versions += @project.rolled_up_versions.visible if @with_subprojects
                 @versions = @versions.uniq.sort
                 @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
                 @issues_by_version = {}
                 unless @selected_tracker_ids.empty?
                   @versions.each do |version|
                     issues = version.fixed_issues.visible.find(:all,
                                                                :include => [:project, :status, :tracker, :priority],
                                                                :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
                                                                :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
                     @issues_by_version[version] = issues
                   end
                 end
                 @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
               end
               def show
                 @issues = @version.fixed_issues.visible.find(:all,
                   :include => [:status, :tracker, :priority],
                   :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
               end
               def new
                 @version = @project.versions.build
                 if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                   @version.attributes = attributes
                 end
               end
               def create
                 # TODO: refactor with code above in #new
                 @version = @project.versions.build
                 if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                   @version.attributes = attributes
                 end
                 if request.post?
                   if @version.save
                     respond_to do |format|
                       format.html do
                         flash[:notice] = l(:notice_successful_create)
-                        redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+                        redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                       end
                       format.js do
                         # IE doesn't support the replace_html rjs method for select box options
                         render(:update) {|page| page.replace "issue_fixed_version_id",
                           content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
                         }
                       end
                     end
                   else
                     respond_to do |format|
                       format.html { render :action => 'new' }
                       format.js do
                         render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
                       end
                     end
                   end
                 end
               end
               def edit
               end
               def update
                 if request.put? && params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
                   if @version.update_attributes(attributes)
                     flash[:notice] = l(:notice_successful_update)
-                    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+                    redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                   else
                     respond_to do |format|
                       format.html { render :action => 'edit' }
                     end
                   end
                 end
               end
               def close_completed
                 if request.put?
                   @project.close_completed_versions
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
               end
               def destroy
                 if @version.fixed_issues.empty?
                   @version.destroy
-                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+                  redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 else
                   flash[:error] = l(:notice_unable_delete_version)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 end
               end
               def status_by
                 respond_to do |format|
                   format.html { render :action => 'show' }
                   format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
                 end
               end
             end

app/views/versions/_form.rhtml +1 0

+            <%= back_url_hidden_field_tag %>
             <%= error_messages_for 'version' %>
             <div class="box">
             <p><%= f.text_field :name, :size => 60, :required => true %></p>
             <p><%= f.text_field :description, :size => 60 %></p>
             <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
             <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
             <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
             <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
             <% @version.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :version, value %></p>
             <% end %>
             </div>

app/views/versions/index.html.erb +4 0

+            <div class="contextual">
+            	<%= link_to l(:label_version_new), {:controller => 'versions', :action => 'new'}, :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
+            </div>
             <h2><%=l(:label_roadmap)%></h2>
             <% if @versions.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <div id="roadmap">
             <% @versions.each do |version| %>
                 <h3 class="version"><%= tag 'a', :name => version.name %><%= link_to_version version %></h3>
                 <%= render :partial => 'versions/overview', :locals => {:version => version} %>
                 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
                 <% if (issues = @issues_by_version[version]) && issues.size > 0 %>
                 <% form_tag({}) do -%>
                 <table class="list related-issues">
                 <caption><%= l(:label_related_issues) %></caption>
                 <%- issues.each do |issue| -%>
                   <tr class="hascontextmenu">
                     <td class="checkbox"><%= check_box_tag 'ids[]', issue.id %></td>
                     <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
                   </tr>
                 <%- end -%>
                 </table>
                 <% end %>
                 <% end %>
                 <%= call_hook :view_projects_roadmap_version_bottom, :version => version %>
             <% end %>
             </div>
             <% end %>
             <% content_for :sidebar do %>
             <% form_tag({}, :method => :get) do %>
             <h3><%= l(:label_roadmap) %></h3>
             <% @trackers.each do |tracker| %>
               <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
               <%=h tracker.name %></label><br />
             <% end %>
             <br />
             <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
             <% if @project.descendants.active.any? %>
             	<%= hidden_field_tag 'with_subprojects', 0 %>
               <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
             <% end %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <h3><%= l(:label_version_plural) %></h3>
             <% @versions.each do |version| %>
             <%= link_to format_version_name(version), "##{version.name}" %><br />
             <% end %>
             <% end %>
             <% html_title(l(:label_roadmap)) %>
             <%= context_menu issues_context_menu_path %>

app/views/versions/show.rhtml +2 0

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
+            <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => @version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)},
+              :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
             <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
             <div id="version-summary">
             <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
             <fieldset><legend><%= l(:label_time_tracking) %></legend>
             <table>
             <tr>
                 <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
                 <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
             <% if User.current.allowed_to?(:view_time_entries, @project) %>
             <tr>
                 <td width="130px" align="right"><%= l(:label_spent_time) %></td>
                 <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
             </tr>
             <% end %>
             </table>
             </fieldset>
             <% end %>
             <div id="status_by">
             <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
             </div>
             </div>
             <% if @issues.present? %>
             <% form_tag({}) do -%>
               <table class="list related-issues">
               <caption><%= l(:label_related_issues) %></caption>
               <%- @issues.each do |issue| -%>
                 <tr class="hascontextmenu">
                   <td class="checkbox"><%= check_box_tag 'ids[]', issue.id %></td>
                   <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
                 </tr>
               <% end %>
               </table>
             <% end %>
             <%= context_menu issues_context_menu_path %>
             <% end %>
             </div>
             <%= call_hook :view_versions_show_bottom, :version => @version %>
             <% html_title @version.name %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages