diff options
author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-10-27 20:24:30 +0300 |
---|---|---|
committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-11-13 10:27:42 +0300 |
commit | 2da77592717cea469785381b15c53b1eafdc2afa (patch) | |
tree | 924ce176b9e17f6e866f4960785c59bc1b8d9d8b /app/helpers | |
parent | 123970182274ead330cdb93a1cb3296884b1cd69 (diff) |
Apply new search bar on issues and merge request dashboards
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/dashboard_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/search_helper.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index 463f4145bdd..d90ef8903a7 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -2,11 +2,11 @@ module DashboardHelper def assigned_issues_dashboard_path - issues_dashboard_path(assignee_id: current_user.id) + issues_dashboard_path(assignee_username: current_user.username) end def assigned_mrs_dashboard_path - merge_requests_dashboard_path(assignee_id: current_user.id) + merge_requests_dashboard_path(assignee_username: current_user.username) end def dashboard_nav_links diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 4f9e1322b56..70c02107b34 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -163,10 +163,11 @@ module SearchHelper if @project.present? opts[:data]['project-id'] = @project.id opts[:data]['base-endpoint'] = project_path(@project) - else - # Group context + elsif @group.present? opts[:data]['group-id'] = @group.id opts[:data]['base-endpoint'] = group_canonical_path(@group) + else + opts[:data]['base-endpoint'] = root_dashboard_path end opts |