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
27a2c592
Commit
27a2c592
authored
Mar 01, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ActiveRecord#toggle! Instead of defining a new one
[ci skip]
parent
89ca576e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
app/controllers/admin/geo_nodes_controller.rb
app/controllers/admin/geo_nodes_controller.rb
+1
-1
app/models/geo_node.rb
app/models/geo_node.rb
+0
-4
No files found.
app/controllers/admin/geo_nodes_controller.rb
View file @
27a2c592
...
@@ -44,7 +44,7 @@ class Admin::GeoNodesController < Admin::ApplicationController
...
@@ -44,7 +44,7 @@ class Admin::GeoNodesController < Admin::ApplicationController
if
@node
.
primary?
if
@node
.
primary?
flash
[
:alert
]
=
"Primary node can't be disabled."
flash
[
:alert
]
=
"Primary node can't be disabled."
else
else
@node
.
toggle!
@node
.
toggle!
(
:enabled
)
new_status
=
@node
.
enabled?
?
'enabled'
:
'disabled'
new_status
=
@node
.
enabled?
?
'enabled'
:
'disabled'
flash
[
:notice
]
=
"Node
#{
@node
.
url
}
was successfully
#{
new_status
}
."
flash
[
:notice
]
=
"Node
#{
@node
.
url
}
was successfully
#{
new_status
}
."
...
...
app/models/geo_node.rb
View file @
27a2c592
...
@@ -39,10 +39,6 @@ class GeoNode < ActiveRecord::Base
...
@@ -39,10 +39,6 @@ class GeoNode < ActiveRecord::Base
!
primary
!
primary
end
end
def
toggle!
update_attribute
(
:enabled
,
!
enabled
)
end
def
uri
def
uri
if
relative_url_root
if
relative_url_root
relative_url
=
relative_url_root
.
starts_with?
(
'/'
)
?
relative_url_root
:
"/
#{
relative_url_root
}
"
relative_url
=
relative_url_root
.
starts_with?
(
'/'
)
?
relative_url_root
:
"/
#{
relative_url_root
}
"
...
...
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