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
0ea5d764
Commit
0ea5d764
authored
Feb 01, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide the link for spam logs if the Askimet is disabled
parent
07384aa0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+4
-0
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+7
-6
No files found.
app/helpers/application_settings_helper.rb
View file @
0ea5d764
...
@@ -23,6 +23,10 @@ module ApplicationSettingsHelper
...
@@ -23,6 +23,10 @@ module ApplicationSettingsHelper
current_application_settings
.
user_oauth_applications
current_application_settings
.
user_oauth_applications
end
end
def
askimet_enabled?
current_application_settings
.
akismet_enabled?
end
# Return a group of checkboxes that use Bootstrap's button plugin for a
# Return a group of checkboxes that use Bootstrap's button plugin for a
# toggle button effect.
# toggle button effect.
def
restricted_level_checkboxes
(
help_block_id
)
def
restricted_level_checkboxes
(
help_block_id
)
...
...
app/views/layouts/nav/_admin.html.haml
View file @
0ea5d764
...
@@ -82,12 +82,13 @@
...
@@ -82,12 +82,13 @@
Abuse Reports
Abuse Reports
%span
.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%span
.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
=
nav_link
(
controller: :spam_logs
)
do
-
if
askimet_enabled?
=
link_to
admin_spam_logs_path
,
title:
"Spam Logs"
do
=
nav_link
(
controller: :spam_logs
)
do
=
icon
(
'exclamation-triangle fw'
)
=
link_to
admin_spam_logs_path
,
title:
"Spam Logs"
do
%span
=
icon
(
'exclamation-triangle fw'
)
Spam Logs
%span
%span
.count
=
number_with_delimiter
(
SpamLog
.
count
(
:all
))
Spam Logs
%span
.count
=
number_with_delimiter
(
SpamLog
.
count
(
:all
))
=
nav_link
(
controller: :application_settings
,
html_options:
{
class:
'separate-item'
})
do
=
nav_link
(
controller: :application_settings
,
html_options:
{
class:
'separate-item'
})
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
...
...
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