Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
birger
users
Commits
a947b23e
Commit
a947b23e
authored
May 24, 2021
by
o@immerda.ch
Browse files
support for force delete domain (with users)
parent
79534a11
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/domains.js
View file @
a947b23e
function
enableDelete
()
{
document
.
getElementById
(
'
enable_delete_form
'
).
style
.
display
=
'
none
'
;
document
.
getElementById
(
'
delete_form
'
).
style
.
display
=
'
block
'
;
}
function
loadActions
()
{
if
(
document
.
getElementById
(
'
enable_delete_form
'
))
document
.
getElementById
(
'
enable_delete_form
'
).
addEventListener
(
"
click
"
,
enableDelete
);
}
window
.
addEventListener
(
"
load
"
,
loadActions
)
app/controllers/concerns/api_backend.rb
View file @
a947b23e
...
...
@@ -121,8 +121,8 @@ module ApiBackend
post
([
'domains'
,
'create'
],
{
'domain'
=>
domain
,
'values'
=>
values
})
end
def
delete_domain
(
domain
)
post
([
'domains'
,
'delete'
],
{
'domain'
=>
domain
}
)
def
delete_domain
(
domain
,
opts
=
{}
)
post
([
'domains'
,
'delete'
],
opts
.
merge
(
'domain'
=>
domain
)
)
end
def
storagehosts
get
([
'mail'
,
'storagehosts'
],
{})
...
...
app/controllers/domains_controller.rb
View file @
a947b23e
...
...
@@ -17,17 +17,20 @@ class DomainsController < AdminController
}
api
.
update_domain
(
@domain
[
'domain'
],
values
)
redirect_to
'/domains'
and
return
rescue
ApiBackend
::
ApiError
flash
[
:danger
]
=
:fail
rescue
ApiBackend
::
ApiError
=>
e
flash
[
:danger
]
=
e
.
api_msg
@domain
=
values
.
merge
({
'domain'
=>
@domain
[
'domain'
]
})
render
'edit'
end
def
delete
api
.
delete_domain
(
@domain
[
'domain'
])
opts
=
{}
opts
[
'force_delete'
]
=
true
if
params
[
:forcedelete
]
==
'1'
api
.
delete_domain
(
@domain
[
'domain'
],
opts
)
redirect_to
domains_path
and
return
rescue
ApiBackend
::
ApiError
flash
[
:danger
]
=
:fail
rescue
ApiBackend
::
ApiError
=>
e
flash
[
:danger
]
=
e
.
api_msg
render
'edit'
end
def
create
...
...
app/views/domains/edit.html.erb
View file @
a947b23e
...
...
@@ -29,8 +29,14 @@
<br
/>
<br
/>
<br
/>
<div
id=
"delete_form"
style=
"display:none"
>
<%=
form_tag
(
"
#{
domains_path
}
/
#{
URI
.
escape
(
@domain
[
'domain'
])
}
/delete"
,
method:
"post"
)
do
%>
<%=
hidden_field_tag
(
:delete
,
''
,
value:
true
)
%>
<input
type=
"checkbox"
id=
"forcedelete"
name=
"forcedelete"
value=
"1"
/>
<%=
t
(
:force_delete
)
%>
<br
/>
<%=
submit_tag
(
t
:delete
)
%>
DANGER DATA LOSS!!!
<%
end
%>
</div>
<a
href=
"#"
id=
"enable_delete_form"
/>
<%=
t
(
:delete
)
%>
</a>
Write
Preview
Supports
Markdown
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