diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 04:21:35 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 04:21:35 +0300 |
| commit | c1818eec1d10688c05467a900f60259490b627c1 (patch) | |
| tree | 948e98b1a1dcd6e58bdadea7eb9ad54117173f59 | |
| parent | cae84aa2788af60219bbca1a83ae63941f11bf47 (diff) | |
| download | gitlab-ce-c1818eec1d10688c05467a900f60259490b627c1.tar.gz | |
Inject group options.
| -rw-r--r-- | app/views/layouts/_search.html.haml | 12 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index b76e31f7dc8..5c6429d07b4 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -41,9 +41,19 @@ gl.projectOptions["#{@project.path}"] = { issuesPath: "#{namespace_project_issues_path(@project.namespace, @project)}", mrPath: "#{namespace_project_merge_requests_path(@project.namespace, @project)}", - projectName: "#{@project.name}" + name: "#{@project.name}" }; + - if @group + :javascript + gl.groupOptions = gl.groupOptions || {}; + gl.groupOptions["#{@group.path}"] = { + name: "#{@group.name}", + issuesPath: "#{issues_group_path(@group.path)}", + mrPath: "#{merge_requests_group_path(@group.path)}" + }; + + :javascript gl.dashboardOptions = { issuesPath: "#{issues_dashboard_url}", diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 504abd8f3e4..33cedaaf2ee 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head" - %body{class: "#{user_application_theme}", 'data-page' => body_data_page, 'data-project' => "#{@project.path if @project}"} + %body{class: "#{user_application_theme}", data: {page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}"}} = Gon::Base.render_data -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. |