jro_apps/redmine Commit - r3754:a84920ca7016

Merged r3865 and r3866 from trunk....

Jean-Philippe Lang -

r3754:a84920ca7016 0.9-stable

parent child

Context file:

r3754:a84920ca7016

Collapse all files

app/controllers/versions_controller.rb +3 0

             # 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
               before_filter :find_version, :except => :close_completed
               before_filter :find_project, :only => :close_completed
               before_filter :authorize
               helper :custom_fields
               helper :projects
               def show
+                @issues = @version.fixed_issues.visible.find(:all,
+                  :include => [:status, :tracker, :priority],
+                  :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
               end
               def edit
                 if request.post? && 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
                   end
                 end
               end
               def close_completed
                 if request.post?
                   @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
                 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_version
                 @version = Version.find(params[:id])
                 @project = @version.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/versions/show.rhtml +2 -5

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
             <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <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>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
-            <% issues = @version.fixed_issues.find(:all,
+            <% if @issues.present? %>
-                                                   :include => [:status, :tracker, :priority],
-                                                   :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %>
-            <% if issues.size > 0 %>
             <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
             <ul>
-            <% issues.each do |issue| -%>
+            <% @issues.each do |issue| -%>
                 <li><%= link_to_issue(issue) %></li>
             <% end -%>
             </ul>
             </fieldset>
             <% 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