Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b9a4bf38
authored
Feb 27, 2019
by
Belákovics Ádám
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'trans_input_fix' into 'master'
Trans input fix See merge request
!403
parents
69f2f207
0e085c30
Pipeline
#697
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
circle/dashboard/static/dashboard/activity.js
+2
-1
circle/dashboard/static/dashboard/dashboard.js
+2
-0
circle/dashboard/views/util.py
+1
-1
No files found.
circle/dashboard/static/dashboard/activity.js
View file @
b9a4bf38
...
...
@@ -41,12 +41,14 @@ $(function() {
$
(
'#confirmation-modal'
).
on
(
'hidden.bs.modal'
,
function
()
{
$
(
'#confirmation-modal'
).
remove
();
});
$
(
'#vm-migrate-node-list li input:checked'
).
closest
(
'li'
).
addClass
(
'panel-primary'
);
}
});
e
.
preventDefault
();
});
/* if the operation fails show the modal again */
$
(
"body"
).
on
(
"click"
,
"#confirmation-modal #op-form-send"
,
function
()
{
var
url
=
$
(
this
).
closest
(
"form"
).
prop
(
"action"
);
...
...
@@ -237,4 +239,3 @@ String.prototype.hashCode = function() {
}
return
hash
;
};
circle/dashboard/static/dashboard/dashboard.js
View file @
b9a4bf38
...
...
@@ -558,3 +558,5 @@ $(function() {
inputs
.
prop
(
"checked"
,
!
inputs
.
prop
(
"checked"
));
});
});
$
.
fn
.
modal
.
Constructor
.
prototype
.
enforceFocus
=
function
()
{};
circle/dashboard/views/util.py
View file @
b9a4bf38
...
...
@@ -682,7 +682,7 @@ class TransferOwnershipConfirmView(LoginRequiredMixin, View):
messages
.
error
(
request
,
_
(
'This token is invalid or has expired.'
))
raise
PermissionDenied
()
return
render
(
request
,
self
.
template
,
dictionary
=
{
'instance'
:
instance
,
'key'
:
key
})
{
'instance'
:
instance
,
'key'
:
key
})
def
change_owner
(
self
,
instance
,
new_owner
):
instance
.
owner
=
new_owner
...
...
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