Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
c7e3e3fe
Commit
c7e3e3fe
authored
Nov 18, 2013
by
Kostas Papadimitriou
Browse files
ui: Improve floating ip status display
parent
cbfb548c
Changes
2
Hide whitespace changes
Inline
Side-by-side
snf-cyclades-app/synnefo/ui/static/snf/js/neutron.js
View file @
c7e3e3fe
...
...
@@ -465,7 +465,10 @@
var
status_ok
=
_
.
contains
([
'
DISCONNECTED
'
],
this
.
get
(
'
status
'
))
return
status_ok
}],
'
disconnect
'
:
[[
'
status
'
],
function
()
{
'
disconnect
'
:
[[
'
status
'
,
'
port_id
'
,
'
port
'
],
function
()
{
var
port
=
this
.
get
(
'
port
'
);
var
vm
=
port
&&
port
.
get
(
'
vm
'
);
if
(
vm
&&
vm
.
get
(
"
task_state
"
))
{
return
false
}
var
status_ok
=
_
.
contains
([
'
ACTIVE
'
,
'
CONNECTED
'
],
this
.
get
(
'
status
'
))
return
status_ok
}]
...
...
@@ -492,13 +495,13 @@
}
else
{
var
port
=
this
.
get
(
'
port
'
);
if
(
port
)
{
var
port_status
=
port
.
get
(
'
status
'
);
var
port_status
=
port
.
get
(
'
ext_
status
'
);
if
(
port_status
==
"
DISCONNECTING
"
)
{
return
port_status
}
return
'
CONNECTED
'
}
return
'
CONNECT
ED
'
return
'
CONNECT
ING
'
}
}
]
...
...
snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_ips_view.js
View file @
c7e3e3fe
...
...
@@ -83,7 +83,7 @@
status_cls_map
:
{
'
CONNECTED
'
:
'
status-active
'
,
'
ACTIVE
'
:
'
status-active
'
,
'
CONNECTING
'
:
'
status-
active
'
,
'
CONNECTING
'
:
'
status-
progress
'
,
'
DISCONNECTING
'
:
'
status-inactive
'
,
'
DOWN
'
:
'
status-inactive
'
,
'
DISCONNECTED
'
:
'
status-inactive
'
,
...
...
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