Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4d11e42a
Commit
4d11e42a
authored
Mar 15, 2020
by
Gilang Gumilar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rearrange group_analytics_navbar_links helper method
parent
35b18fe2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
app/views/layouts/nav/sidebar/_analytics_links.html.haml
app/views/layouts/nav/sidebar/_analytics_links.html.haml
+0
-1
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+1
-1
ee/app/helpers/ee/analytics_navbar_helper.rb
ee/app/helpers/ee/analytics_navbar_helper.rb
+2
-2
No files found.
app/views/layouts/nav/sidebar/_analytics_links.html.haml
View file @
4d11e42a
-
navbar_links
=
links
.
sort_by
(
&
:title
)
-
all_paths
=
navbar_links
.
map
(
&
:path
)
-
all_paths
=
navbar_links
.
map
(
&
:path
)
-
if
navbar_links
.
any?
-
if
navbar_links
.
any?
...
...
app/views/layouts/nav/sidebar/_group.html.haml
View file @
4d11e42a
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
=
render_if_exists
'groups/sidebar/packages'
=
render_if_exists
'groups/sidebar/packages'
=
render
'layouts/nav/sidebar/analytics_links'
,
links:
group_analytics_navbar_links
(
@group
,
current_user
)
=
render
'layouts/nav/sidebar/analytics_links'
,
navbar_
links:
group_analytics_navbar_links
(
@group
,
current_user
)
-
if
group_sidebar_link?
(
:group_members
)
-
if
group_sidebar_link?
(
:group_members
)
=
nav_link
(
path:
'group_members#index'
)
do
=
nav_link
(
path:
'group_members#index'
)
do
...
...
ee/app/helpers/ee/analytics_navbar_helper.rb
View file @
4d11e42a
...
@@ -16,11 +16,11 @@ module EE
...
@@ -16,11 +16,11 @@ module EE
override
:group_analytics_navbar_links
override
:group_analytics_navbar_links
def
group_analytics_navbar_links
(
group
,
current_user
)
def
group_analytics_navbar_links
(
group
,
current_user
)
super
+
[
super
+
[
group_cycle_analytics_navbar_link
(
group
,
current_user
),
issues_analytics_navbar_link
(
group
,
current_user
),
contribution_analytics_navbar_link
(
group
,
current_user
),
contribution_analytics_navbar_link
(
group
,
current_user
),
group_insights_navbar_link
(
group
,
current_user
),
group_insights_navbar_link
(
group
,
current_user
),
issues_analytics_navbar_link
(
group
,
current_user
),
productivity_analytics_navbar_link
(
group
,
current_user
),
productivity_analytics_navbar_link
(
group
,
current_user
),
group_cycle_analytics_navbar_link
(
group
,
current_user
)
].
compact
].
compact
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment