diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-06 19:27:12 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-06 19:27:12 +0300 |
| commit | e5183d907e9db2bdf87dae83708b35a970a829ba (patch) | |
| tree | edc05f30dd515cbe7ef3966a2b7aab7e835c4286 /app/views/projects/labels | |
| parent | c85df8105e3b8982ecf6a16f8ae9f3af2f130030 (diff) | |
| parent | e1a64f0c6d769c38918c50fdbd9b72b0f6fcfa4a (diff) | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/projects/labels')
| -rw-r--r-- | app/views/projects/labels/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/labels/index.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/labels/new.html.haml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/labels/edit.html.haml b/app/views/projects/labels/edit.html.haml index 7f0059cdcda..84b0b65d1c0 100644 --- a/app/views/projects/labels/edit.html.haml +++ b/app/views/projects/labels/edit.html.haml @@ -6,4 +6,4 @@ %h3.page-title Edit Label %hr - = render 'shared/labels/form', url: namespace_project_label_path(@project.namespace.becomes(Namespace), @project, @label), back_path: namespace_project_labels_path(@project.namespace, @project) + = render 'shared/labels/form', url: project_label_path(@project, @label), back_path: project_labels_path(@project) diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 0a63325f26e..d02ea5cccc3 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -16,7 +16,8 @@ .nav-controls{ class: ("visible-xs" if show_new_nav?) } - if can?(current_user, :admin_label, @project) - = link_to "New label", new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" + = link_to new_project_label_path(@project), class: "btn btn-new" do + New label .labels - if can?(current_user, :admin_label, @project) @@ -24,7 +25,7 @@ - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') .prioritized-labels{ class: ('hide' if hide) } %h5 Prioritized Labels - %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) } + %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_project_labels_path(@project) } #js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } = render 'shared/empty_states/priority_labels' - if @prioritized_labels.present? diff --git a/app/views/projects/labels/new.html.haml b/app/views/projects/labels/new.html.haml index 8f6c085a361..79e90b7ca3b 100644 --- a/app/views/projects/labels/new.html.haml +++ b/app/views/projects/labels/new.html.haml @@ -6,4 +6,4 @@ %h3.page-title New Label %hr - = render 'shared/labels/form', url: namespace_project_labels_path(@project.namespace.becomes(Namespace), @project), back_path: namespace_project_labels_path(@project.namespace, @project) + = render 'shared/labels/form', url: project_labels_path(@project), back_path: project_labels_path(@project) |