From 5d098d4b94ebd3d53648dc4e20d8944945a5c5ad Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Wed, 15 May 2013 23:36:48 +0600 Subject: [PATCH 1/4] [#98] fix title of the page --- app/views/home/issues.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/issues.html.haml b/app/views/home/issues.html.haml index 74e2dde80..13e875698 100644 --- a/app/views/home/issues.html.haml +++ b/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("users.users.#{action_name}.title") -render 'top_menu' -content_for :sidebar do =form_tag send("#{action_name}_path"), :id => 'filter_issues', :method => :get do From e9f2a5a4a365f84dcabe1eb65e06f97eef640c49 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 16 May 2013 15:31:10 +0600 Subject: [PATCH 2/4] [#98] again fix common tracker/pulls title --- app/views/home/issues.html.haml | 2 +- config/locales/title.ru.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/issues.html.haml b/app/views/home/issues.html.haml index 13e875698..3035a5315 100644 --- a/app/views/home/issues.html.haml +++ b/app/views/home/issues.html.haml @@ -1,4 +1,4 @@ --set_meta_tags :title => t("users.users.#{action_name}.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 diff --git a/config/locales/title.ru.yml b/config/locales/title.ru.yml index 94aef3936..b991fc6a3 100644 --- a/config/locales/title.ru.yml +++ b/config/locales/title.ru.yml @@ -33,7 +33,7 @@ ru: product_build_lists: index: title: 'Мониторинг продуктов' - pages: + home: issues: title: 'Ваши задачи' pull_requests: From 30a54e6809721706627097f3ad61b17474f73956 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 16 May 2013 15:52:16 +0600 Subject: [PATCH 3/4] [#98] show in tracker sidebar count only open issues --- app/views/home/issues.html.haml | 2 +- app/views/projects/issues/_index_sidebar.html.haml | 4 ++-- app/views/projects/pull_requests/_index_sidebar.html.haml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/home/issues.html.haml b/app/views/home/issues.html.haml index 3035a5315..91e729667 100644 --- a/app/views/home/issues.html.haml +++ b/app/views/home/issues.html.haml @@ -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 diff --git a/app/views/projects/issues/_index_sidebar.html.haml b/app/views/projects/issues/_index_sidebar.html.haml index 98aa865f4..154ee8ba1 100644 --- a/app/views/projects/issues/_index_sidebar.html.haml +++ b/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') diff --git a/app/views/projects/pull_requests/_index_sidebar.html.haml b/app/views/projects/pull_requests/_index_sidebar.html.haml index 05c051d32..df07380c7 100644 --- a/app/views/projects/pull_requests/_index_sidebar.html.haml +++ b/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') From 8b0665ab27257df4d72cbe2531041d1da370fc04 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 16 May 2013 16:01:06 +0600 Subject: [PATCH 4/4] [#98] fix common tracker/pulls title for english locale --- config/locales/title.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/title.en.yml b/config/locales/title.en.yml index 203591d9f..887e2ada2 100644 --- a/config/locales/title.en.yml +++ b/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: