root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

rename snippets_path helper due to conflict

This commit is contained in:
Mike Greiling 2016-12-09 17:33:23 -06:00
parent dccd53e1ce
commit 730ff2e50b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/snippets_helper.rb
View File

@ -11,7 +11,7 @@ module SnippetsHelper
# Return the path of a snippets index for a user or for a project # Return the path of a snippets index for a user or for a project
# #
# @returns String, path to snippet index # @returns String, path to snippet index
def snippets_path(subject = nil, opts = nil) def subject_snippets_path(subject = nil, opts = nil)
if subject.is_a?(Project) if subject.is_a?(Project)
namespace_project_snippets_path(subject.namespace, subject, opts) namespace_project_snippets_path(subject.namespace, subject, opts)
else # assume subject === User else # assume subject === User

8
app/views/snippets/_snippets_scope_menu.html.haml
View File

@ -3,7 +3,7 @@
.nav-links.snippet-scope-menu .nav-links.snippet-scope-menu
%li{ class: ("active" unless params[:scope]) } %li{ class: ("active" unless params[:scope]) }
= link_to snippets_path(subject) do = link_to subject_snippets_path(subject) do
All All
%span.badge %span.badge
- if include_private - if include_private
@ -13,19 +13,19 @@
- if include_private - if include_private
%li{ class: ("active" if params[:scope] == "are_private") } %li{ class: ("active" if params[:scope] == "are_private") }
= link_to snippets_path(subject, scope: 'are_private') do = link_to subject_snippets_path(subject, scope: 'are_private') do
Private Private
%span.badge %span.badge
= subject.snippets.are_private.count = subject.snippets.are_private.count
%li{ class: ("active" if params[:scope] == "are_internal") } %li{ class: ("active" if params[:scope] == "are_internal") }
= link_to snippets_path(subject, scope: 'are_internal') do = link_to subject_snippets_path(subject, scope: 'are_internal') do
Internal Internal
%span.badge %span.badge
= subject.snippets.are_internal.count = subject.snippets.are_internal.count
%li{ class: ("active" if params[:scope] == "are_public") } %li{ class: ("active" if params[:scope] == "are_public") }
= link_to snippets_path(subject, scope: 'are_public') do = link_to subject_snippets_path(subject, scope: 'are_public') do
Public Public
%span.badge %span.badge
= subject.snippets.are_public.count = subject.snippets.are_public.count