Merge pull request #131 from abf/rosa-build:98-common_tracker

[refs #98] fix titles & show count only opened issues/pull requests in sidebar

app/views/home/issues.html.haml

@@ -1,4 +1,4 @@
--set_meta_tags :title => t("users.users.#{action_name}_index.title")
+-set_meta_tags :title => t("home.#{action_name}.title")
 -render 'top_menu'
 -content_for :sidebar do
   =form_tag send("#{action_name}_path"), :id => 'filter_issues', :method => :get do
@@ -8,5 +8,5 @@
           %tr
             %td.width18=radio_button_tag :myradio, filter, filter == @filter, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'}
             %td.width135=t("layout.#{action_name}.#{filter}")
-            %td.width30.right=instance_variable_get("@#{filter}_issues").count
+            %td.width30.right=instance_variable_get("@#{filter}_issues").not_closed_or_merged.count
 =render 'projects/issues/issues_table', :issues => @issues

app/views/projects/issues/_index_sidebar.html.haml

@@ -6,11 +6,11 @@
           %tr
             %td.width18=radio_button_tag :myradio, 'all', !@is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'}
             %td.width135=t('layout.issues.all')
-            %td.width30.right=@project.issues.without_pull_requests.count
+            %td.width30.right=@project.issues.without_pull_requests.not_closed_or_merged.count
           %tr
             %td=radio_button_tag :myradio, 'assigned', @is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'}
             %td=t('layout.issues.assigned')
-            %td.width30.right=@project.issues.without_pull_requests.where(:assignee_id => current_user.id).count
+            %td.width30.right=@project.issues.without_pull_requests.where(:assignee_id => current_user.id).not_closed_or_merged.count
   =form_tag project_issues_path(@project), :id => 'search_issue', :class => 'ajax_search_form', :method => :get do
     .bordered.bpadding20
       - search = params[:search_issue].present? ? params[:search_issue] : t('layout.issues.search')

app/views/projects/pull_requests/_index_sidebar.html.haml

@@ -6,11 +6,11 @@
           %tr
             %td.width18=radio_button_tag :myradio, 'all', !@is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'}
             %td.width135=t("layout.pull_requests.all")
-            %td.width30.right=@project.issues.joins(:pull_request).count
+            %td.width30.right=@project.issues.joins(:pull_request).not_closed_or_merged.count
           %tr
             %td=radio_button_tag :myradio, 'to_me', @is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'}
             %td=t("layout.pull_requests.to_me")
-            %td.width30.right=@project.issues.joins(:pull_request).where(:assignee_id => current_user.id).count
+            %td.width30.right=@project.issues.joins(:pull_request).where(:assignee_id => current_user.id).not_closed_or_merged.count
   =form_tag project_pull_requests_path(@project), :id => 'filter_pull_requests', :method => :get, :class => 'ajax_search_form' do
     .bordered.bpadding20
       - search = params[:search_pull_request].present? ? params[:search_pull_request] : t('layout.pull_requests.search')

config/locales/title.en.yml

@@ -33,7 +33,7 @@ en:
     product_build_lists:
       index:
         title: 'Products Monitoring'
-  pages:
+  home:
     issues:
       title: 'Your Issues'
     pull_requests:

config/locales/title.ru.yml

@@ -33,7 +33,7 @@ ru:
     product_build_lists:
       index:
         title: 'Мониторинг продуктов'
-  pages:
+  home:
     issues:
       title: 'Ваши задачи'
     pull_requests: