diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-14 16:39:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-14 16:39:44 +0000 |
| commit | 3248911c08755b8c2885e88c65f3af33e6d1800c (patch) | |
| tree | 8b65fd70fcae5e6b0bedbdeecce635335a1b5915 /app | |
| parent | be22bf5c7382b388a06cbde01438ba38582994f7 (diff) | |
| parent | 6e3ca79dedbe27f64d12dbf391d0823137dcc610 (diff) | |
| download | gitlab-ce-3248911c08755b8c2885e88c65f3af33e6d1800c.tar.gz | |
Merge branch '7-days-cycle-analytics' into 'master'
Add a `Last 7 days` option for Cycle Analytics view
Closes #36300
See merge request !13443
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/cycle_analytics_params.rb | 9 | ||||
| -rw-r--r-- | app/views/projects/cycle_analytics/show.html.haml | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/concerns/cycle_analytics_params.rb b/app/controllers/concerns/cycle_analytics_params.rb index 52e06f4945a..1ab107168c0 100644 --- a/app/controllers/concerns/cycle_analytics_params.rb +++ b/app/controllers/concerns/cycle_analytics_params.rb @@ -6,6 +6,13 @@ module CycleAnalyticsParams end def start_date(params) - params[:start_date] == '30' ? 30.days.ago : 90.days.ago + case params[:start_date] + when '7' + 7.days.ago + when '30' + 30.days.ago + else + 90.days.ago + end end end diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index c704635ead3..3467e357c49 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -40,6 +40,9 @@ %i.fa.fa-chevron-down %ul.dropdown-menu.dropdown-menu-align-right %li + %a{ "href" => "#", "data-value" => "7" } + {{ n__('Last %d day', 'Last %d days', 7) }} + %li %a{ "href" => "#", "data-value" => "30" } {{ n__('Last %d day', 'Last %d days', 30) }} %li |