diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 4d0ea7595..fa6aaea5e 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -170,7 +170,7 @@ class IssuesController < ApplicationController return unless update_issue_from_params respond_to do |format| - format.html { } + format.html {render :layout => 'base_projects' }#added by young format.xml { } end end diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 1eeecf568..1f6349934 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -38,8 +38,15 @@ class VersionsController < ApplicationController 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 += @project.rolled_up_versions.visible if @with_subprojects + #added by young @versions = @versions.uniq.sort + @offset, @limit = api_offset_and_limit({:limit => 4}) + @versions_count = @versions.count + @versions_pages = Paginator.new @versions_count, @limit, params['page'] + @offset ||= @versions_pages.offset + @versions = @versions.slice(@offset, @limit) + #end by young unless params[:completed] @completed_versions = @versions.select {|version| version.closed? || version.completed? } @versions -= @completed_versions @@ -54,7 +61,7 @@ class VersionsController < ApplicationController ) @issues_by_version = issues.group_by(&:fixed_version) end - @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?} + @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?} } format.api { @versions = @project.shared_versions.all diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 2cc7eb173..6f0b6883c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -103,7 +103,6 @@ <%= link_to l(:project_module_boards) ,project_boards_path(@project) %> -
diff --git a/app/views/versions/_overview.html.erb b/app/views/versions/_overview.html.erb index 4203a8463..fdb0bcd4a 100644 --- a/app/views/versions/_overview.html.erb +++ b/app/views/versions/_overview.html.erb @@ -1,21 +1,6 @@ -<% if version.completed? %> -

<%= format_date(version.effective_date) %>

-<% elsif version.effective_date %> -

<%= due_date_distance_in_words(version.effective_date) %> (<%= format_date(version.effective_date) %>)

-<% end %> - -

<%=h version.description %>

-<% if version.custom_field_values.any? %> - -<% end %> - + <% if version.issues_count > 0 %> +

»<%= l(:label_versions_progress)%>

<%= progress_bar([version.closed_percent, version.completed_percent], :width => '40em', :legend => ('%0.0f%' % version.completed_percent)) %>

<%= link_to(l(:label_x_issues, :count => version.issues_count), diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 50a7a8411..bc0c11902 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -1,56 +1,29 @@ +

<%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
-

<%=l(:label_roadmap)%>

- -<% if @versions.empty? %> -

<%= l(:label_no_data) %>

-<% else %> -
-<% @versions.each do |version| %> -

<%= link_to_version version, :name => version_anchor(version) %>

- <%= 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 -%> - - - <% issues.each do |issue| -%> - - - - - <% end -%> -
<%= l(:label_related_issues) %>
<%= check_box_tag 'ids[]', issue.id, false, :id => nil %><%= link_to_issue(issue, :project => (@project != issue.project)) %>
- <% end %> - <% end %> - <%= call_hook :view_projects_roadmap_version_bottom, :version => version %> -<% end %> -
-<% end %> - -<% content_for :sidebar do %> +

<%=l(:label_roadmap)%>

+ + + + +<% if @versions.empty? %> +

<%= l(:label_no_data) %>

+<% else %> +
+ <% @versions.each do |version| %> +
+

+

+ <%= link_to_version version, :name => version_anchor(version) %> + <% if version.completed? %> + <%= format_date(version.effective_date) %> + <% elsif version.effective_date %> + <%= due_date_distance_in_words(version.effective_date) %> (<%= format_date(version.effective_date) %>) + <% end %> +

+

+ <%= 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 -%> + + + <% issues.each do |issue| -%> + + + + + <% end -%> +
»<%= l(:label_related_issues) %>
<%= check_box_tag 'ids[]', issue.id, false, :id => nil %><%= link_to_issue(issue, :project => (@project != issue.project)) %>
+ <% end %> + <% end %> + + »<%= l(:label_versions_description)%> +

<%=h version.description %>

+ <% if version.custom_field_values.any? %> + + <% end %> + + <%= call_hook :view_projects_roadmap_version_bottom, :version => version %> +
+ <% end %> + +
<% end %> + <% html_title(l(:label_roadmap)) %> <%= context_menu issues_context_menu_path %> diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 2a0fdcc18..9bf379ced 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -1,3 +1,4 @@ +
<%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> <%= 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? %> @@ -11,7 +12,7 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -
+
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
<%= l(:label_time_tracking) %> @@ -29,7 +30,7 @@ <% end %> -
+
<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 51e4c695e..7515bdd2d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -500,6 +500,9 @@ zh: lastest_respond: 最新反馈 label_respond_view_all: 其他120个反馈 label_news_lastest: 最新动态 + label_versions_settings: 显示配置 + label_versions_progress: 完成进度 + label_versions_description: 版本描述 #end label_my_page: 我的工作台 label_my_account: 我的帐号