Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
924c7552
authored
Feb 06, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: rename datastore page to storage
parent
a9b4e22e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
50 deletions
+10
-50
circle/dashboard/tables.py
+1
-1
circle/dashboard/templates/dashboard/datastore/list.html
+0
-40
circle/dashboard/templates/dashboard/storage/detail.html
+1
-1
circle/dashboard/urls.py
+3
-3
circle/dashboard/views/__init__.py
+1
-1
circle/dashboard/views/storage.py
+4
-4
No files found.
circle/dashboard/tables.py
View file @
924c7552
...
...
@@ -314,4 +314,4 @@ class DiskListTable(Table):
fields
=
(
"pk"
,
"name"
,
"filename"
,
"size"
,
"is_ready"
)
prefix
=
"disk-"
order_by
=
(
"-pk"
,
)
per_page
=
99999999999
per_page
=
65536
circle/dashboard/templates/dashboard/datastore/list.html
deleted
100644 → 0
View file @
a9b4e22e
{% extends "dashboard/base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load render_table from django_tables2 %}
{% block title-page %}{% trans "Datastores" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<h3
class=
"no-margin"
><i
class=
"fa fa-desktop"
></i>
{% trans "Datastores" %}
</h3>
</div>
<div
class=
"panel-body"
>
<div
class=
"table-responsive"
>
{% render_table table %}
</div>
</div>
<!-- .panel-body -->
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<h3
class=
"no-margin"
><i
class=
"fa fa-desktop"
></i>
{% trans "Disks" %}
</h3>
</div>
<div
class=
"panel-body"
>
<div
class=
"table-responsive"
>
</div>
</div>
<!-- .panel-body -->
</div>
</div>
</div>
{% endblock %}
circle/dashboard/templates/dashboard/
datastor
e/detail.html
→
circle/dashboard/templates/dashboard/
storag
e/detail.html
View file @
924c7552
...
...
@@ -4,7 +4,7 @@
{% load render_table from django_tables2 %}
{% load crispy_forms_tags %}
{% block title-page %}{% trans "
Datastores
" %}{% endblock %}
{% block title-page %}{% trans "
Storage
" %}{% endblock %}
{% block content %}
...
...
circle/dashboard/urls.py
View file @
924c7552
...
...
@@ -52,7 +52,7 @@ from .views import (
TransferTemplateOwnershipView
,
TransferTemplateOwnershipConfirmView
,
OpenSearchDescriptionView
,
NodeActivityView
,
DataStor
eDetail
,
Storag
eDetail
,
)
from
.views.vm
import
vm_ops
,
vm_mass_ops
from
.views.node
import
node_ops
...
...
@@ -226,8 +226,8 @@ urlpatterns = patterns(
name
=
"dashboard.views.vm-opensearch"
),
url
(
r'^
datastore/$'
,
DataStor
eDetail
.
as_view
(),
name
=
"dashboard.views.
datastor
e"
),
url
(
r'^
storage/$'
,
Storag
eDetail
.
as_view
(),
name
=
"dashboard.views.
storag
e"
),
)
urlpatterns
+=
patterns
(
...
...
circle/dashboard/views/__init__.py
View file @
924c7552
...
...
@@ -12,4 +12,4 @@ from user import *
from
util
import
*
from
vm
import
*
from
graph
import
*
from
disk
import
*
from
storage
import
*
circle/dashboard/views/
disk
.py
→
circle/dashboard/views/
storage
.py
View file @
924c7552
...
...
@@ -29,16 +29,16 @@ from ..tables import DiskListTable
from
..forms
import
DataStoreForm
class
DataStor
eDetail
(
UpdateView
):
class
Storag
eDetail
(
UpdateView
):
model
=
DataStore
form_class
=
DataStoreForm
template_name
=
"dashboard/
datastor
e/detail.html"
template_name
=
"dashboard/
storag
e/detail.html"
def
get_object
(
self
):
return
DataStore
.
objects
.
get
()
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
DataStor
eDetail
,
self
)
.
get_context_data
(
**
kwargs
)
context
=
super
(
Storag
eDetail
,
self
)
.
get_context_data
(
**
kwargs
)
ds
=
self
.
get_object
()
context
[
'stats'
]
=
self
.
_get_stats
()
...
...
@@ -66,4 +66,4 @@ class DataStoreDetail(UpdateView):
}
def
get_success_url
(
self
):
return
reverse
(
"dashboard.views.
datastor
e"
)
return
reverse
(
"dashboard.views.
storag
e"
)
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