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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
019f5766
authored
Sep 11, 2013
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fix instance url
parent
97277697
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
circle/dashboard/templates/dashboard/index-vm.html
+1
-1
circle/vm/models.py
+1
-2
No files found.
circle/dashboard/templates/dashboard/index-vm.html
View file @
019f5766
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</div>
</div>
<div
class=
"list-group"
id=
"vm-list-view"
>
<div
class=
"list-group"
id=
"vm-list-view"
>
{% for i in instances %}
{% for i in instances %}
<a
href=
"{% url i %
}"
class=
"list-group-item"
>
<a
href=
"{{ i.get_absolute_url }
}"
class=
"list-group-item"
>
<i
class=
"icon-play-sign"
></i>
{{ i.name }}
<div
class=
"pull-right"
><i
class=
"icon-star text-primary"
title=
"Mark as favorite."
></i></div>
<i
class=
"icon-play-sign"
></i>
{{ i.name }}
<div
class=
"pull-right"
><i
class=
"icon-star text-primary"
title=
"Mark as favorite."
></i></div>
</a>
</a>
{% endfor %}
{% endfor %}
...
...
circle/vm/models.py
View file @
019f5766
...
@@ -301,8 +301,7 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
...
@@ -301,8 +301,7 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
@models.permalink
@models.permalink
def
get_absolute_url
(
self
):
def
get_absolute_url
(
self
):
# TODO is this obsolete?
return
(
'dashboard.views.detail'
,
None
,
{
'id'
:
self
.
id
})
return
(
'one.views.vm_show'
,
None
,
{
'iid'
:
self
.
id
})
@property
@property
def
vm_name
(
self
):
def
vm_name
(
self
):
...
...
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