diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-06 15:40:35 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-06-06 11:59:49 -0500 |
| commit | 77f30af0179164fe3e893df616eb60beb8a1d9fe (patch) | |
| tree | ce8d4b24c5a9290b79e35667d9316d5214759988 | |
| parent | b0ec4b9cc37f30c90d4bceff5e8b8efbac25dedc (diff) | |
| download | gitlab-ce-77f30af0179164fe3e893df616eb60beb8a1d9fe.tar.gz | |
Tidy up Ruby style in templates
| -rw-r--r-- | app/views/projects/labels/index.html.haml | 9 | ||||
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 0450f512041..5deb84ad41e 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -13,9 +13,8 @@ .labels - if can?(current_user, :admin_label, @project) -# Only show it in the first page - - if (params[:page].present? and params[:page] != '1') or @project.labels.blank? or (params[:page] == nil and @project.labels.blank?) - - hide_class = 'hide' - .prioritized-labels{ class: hide_class } + - hide = @project.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) } - if @prioritized_labels.present? @@ -24,14 +23,14 @@ %p.empty-message No prioritized labels yet .other-labels - if can?(current_user, :admin_label, @project) - %h5{ class: hide_class } Other Labels + %h5{ class: ('hide' if hide } Other Labels - if @labels.present? %ul.content-list.manage-labels-list.js-other-labels = render @labels = paginate @labels, theme: 'gitlab' - else .nothing-here-block - - if can? current_user, :admin_label, @project + - if can?(current_user, :admin_label, @project) Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}. - else No labels created diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index c53f32d97e8..d315a3fe93b 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,5 +1,5 @@ %span.label-row - - if can? current_user, :admin_label, @project + - if can?(current_user, :admin_label, @project) .js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label), dom_id: dom_id(label) } } %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' } |