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
34437208
Commit
34437208
authored
Aug 02, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide and reset namespaces select when primary checkbox is checked
parent
d7be6810
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
4 deletions
+25
-4
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-0
app/assets/javascripts/geo/geo_node_form.js
app/assets/javascripts/geo/geo_node_form.js
+19
-0
app/views/admin/geo_nodes/_form.html.haml
app/views/admin/geo_nodes/_form.html.haml
+2
-2
app/views/admin/geo_nodes/edit.html.haml
app/views/admin/geo_nodes/edit.html.haml
+1
-1
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+1
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
34437208
...
@@ -57,6 +57,7 @@ import UserCallout from './user_callout';
...
@@ -57,6 +57,7 @@ import UserCallout from './user_callout';
import
ShortcutsWiki
from
'
./shortcuts_wiki
'
;
import
ShortcutsWiki
from
'
./shortcuts_wiki
'
;
import
Pipelines
from
'
./pipelines
'
;
import
Pipelines
from
'
./pipelines
'
;
import
BlobViewer
from
'
./blob/viewer/index
'
;
import
BlobViewer
from
'
./blob/viewer/index
'
;
import
GeoNodeForm
from
'
./geo/geo_node_form
'
;
import
GeoNodes
from
'
./geo_nodes
'
;
import
GeoNodes
from
'
./geo_nodes
'
;
import
AutoWidthDropdownSelect
from
'
./issuable/auto_width_dropdown_select
'
;
import
AutoWidthDropdownSelect
from
'
./issuable/auto_width_dropdown_select
'
;
import
UsersSelect
from
'
./users_select
'
;
import
UsersSelect
from
'
./users_select
'
;
...
@@ -611,6 +612,7 @@ import initGroupAnalytics from './init_group_analytics';
...
@@ -611,6 +612,7 @@ import initGroupAnalytics from './init_group_analytics';
break
;
break
;
case
'
geo_nodes
'
:
case
'
geo_nodes
'
:
new
GeoNodes
(
$
(
'
.geo-nodes
'
));
new
GeoNodes
(
$
(
'
.geo-nodes
'
));
new
GeoNodeForm
(
$
(
'
.js-geo-node-form
'
));
break
;
break
;
}
}
break
;
break
;
...
...
app/assets/javascripts/geo/geo_node_form.js
0 → 100644
View file @
34437208
export
default
class
GeoNodeForm
{
constructor
(
container
)
{
this
.
$container
=
$
(
container
);
this
.
$namespaces
=
this
.
$container
.
find
(
"
.js-namespaces
"
);
this
.
$namespacesSelect
=
this
.
$namespaces
.
find
(
'
.select2
'
);
this
.
$primaryCheckbox
=
this
.
$container
.
find
(
"
input[type='checkbox']
"
);
this
.
$primaryCheckbox
.
on
(
'
change
'
,
e
=>
this
.
onPrimaryCheckboxChange
(
e
));
}
onPrimaryCheckboxChange
(
event
)
{
this
.
$namespacesSelect
.
select2
(
'
data
'
,
null
);
if
(
this
.
$primaryCheckbox
.
is
(
'
:checked
'
))
{
this
.
$namespaces
.
addClass
(
'
hidden
'
);
}
else
{
this
.
$namespaces
.
removeClass
(
'
hidden
'
);
}
}
}
app/views/admin/geo_nodes/_form.html.haml
View file @
34437208
...
@@ -20,9 +20,9 @@
...
@@ -20,9 +20,9 @@
-
unless
disable_key_edit
-
unless
disable_key_edit
%p
.help-block
%p
.help-block
Paste a machine public key here for the GitLab user this node runs on. Read more about how to generate it
Paste a machine public key here for the GitLab user this node runs on. Read more about how to generate it
=
link_to
"here"
,
help_page_path
(
"ssh/README"
)
=
link_to
'here'
,
help_page_path
(
'ssh/README'
)
.form-group
.form-group
.js-namespaces
{
class:
(
'hidden'
unless
geo_node
.
new_record?
||
geo_node
.
secondary?
)
}
=
form
.
label
:namespace_ids
,
'Namespaces to replicate'
,
class:
'control-label'
=
form
.
label
:namespace_ids
,
'Namespaces to replicate'
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
form
.
select
:namespace_ids
,
namespaces_options
(
geo_node
.
namespace_ids
),
{
include_hidden:
true
},
multiple:
true
,
class:
'select2 select-wide'
,
data:
{
field:
'group_ids'
}
=
form
.
select
:namespace_ids
,
namespaces_options
(
geo_node
.
namespace_ids
),
{
include_hidden:
true
},
multiple:
true
,
class:
'select2 select-wide'
,
data:
{
field:
'group_ids'
}
...
...
app/views/admin/geo_nodes/edit.html.haml
View file @
34437208
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%h3
.page-title
%h3
.page-title
Edit Geo Node
Edit Geo Node
=
form_for
[
:admin
,
@node
],
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
form_for
[
:admin
,
@node
],
html:
{
class:
'form-horizontal
js-geo-node-form
'
}
do
|
f
|
=
render
partial:
'form'
,
locals:
{
form:
f
,
geo_node:
@node
,
disable_key_edit:
true
}
=
render
partial:
'form'
,
locals:
{
form:
f
,
geo_node:
@node
,
disable_key_edit:
true
}
.form-actions
.form-actions
=
f
.
submit
'Save changes'
,
class:
'btn btn-create'
=
f
.
submit
'Save changes'
,
class:
'btn btn-create'
...
...
app/views/admin/geo_nodes/index.html.haml
View file @
34437208
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%hr
%hr
-
if
Gitlab
::
Geo
.
license_allows?
-
if
Gitlab
::
Geo
.
license_allows?
=
form_for
[
:admin
,
@node
],
as: :geo_node
,
url:
admin_geo_nodes_path
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
form_for
[
:admin
,
@node
],
as: :geo_node
,
url:
admin_geo_nodes_path
,
html:
{
class:
'form-horizontal
js-geo-node-form
'
}
do
|
f
|
=
render
partial:
'form'
,
locals:
{
form:
f
,
geo_node:
@node
}
=
render
partial:
'form'
,
locals:
{
form:
f
,
geo_node:
@node
}
.form-actions
.form-actions
=
f
.
submit
'Add Node'
,
class:
'btn btn-create'
=
f
.
submit
'Add Node'
,
class:
'btn btn-create'
...
...
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