From 4855e86a3fe9062c9306a32e71068cc31e45c827 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 4 Sep 2016 21:47:10 +0800
Subject: [PATCH] Add asset group view
---
apps/assets/models.py | 4 ++++
apps/assets/templates/assets/assetgroup_add.html | 6 +++---
apps/assets/templates/assets/assetgroup_list.html | 12 ++++++------
apps/assets/urls.py | 2 +-
apps/assets/views.py | 1 +
apps/templates/_header_bar.html | 2 +-
apps/users/locale/zh_CN/LC_MESSAGES/django.po | 2 +-
apps/users/templates/users/_user.html | 2 +-
apps/users/templates/users/forget_password.html | 2 +-
apps/users/templates/users/user_list.html | 2 +-
10 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/apps/assets/models.py b/apps/assets/models.py
index 740c2445..5098e052 100644
--- a/apps/assets/models.py
+++ b/apps/assets/models.py
@@ -130,8 +130,12 @@ class Asset(models.Model):
def __unicode__(self):
return self.ip
+ def initial(self):
+ pass
+
class Meta:
db_table = 'asset'
+ index_together = ('ip', 'port')
class Label(models.Model):
diff --git a/apps/assets/templates/assets/assetgroup_add.html b/apps/assets/templates/assets/assetgroup_add.html
index 112eb048..4c032c0a 100644
--- a/apps/assets/templates/assets/assetgroup_add.html
+++ b/apps/assets/templates/assets/assetgroup_add.html
@@ -36,7 +36,7 @@
<div class="col-sm-9">
<select name="assets" id="assets" data-placeholder="{% trans 'Select asset' %}" class="select2 form-control m-b" multiple tabindex="2">
{% for asset in assets %}
- <option value="{{ asset.id }}">{{ asset.hostname }}</option>
+ <option value="{{ asset.id }}">{{ asset.ip }}:{{ asset.port }}</option>
{% endfor %}
</select>
</div>
@@ -46,8 +46,8 @@
<div class="form-group">
<div class="col-sm-4 col-sm-offset-2">
- <button class="btn btn-white" type="reset">å–消</button>
- <button id="submit_button" class="btn btn-primary" type="submit">确认ä¿å˜</button>
+ <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
+ <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
</div>
</div>
</form>
diff --git a/apps/assets/templates/assets/assetgroup_list.html b/apps/assets/templates/assets/assetgroup_list.html
index 51605a54..8fb19668 100644
--- a/apps/assets/templates/assets/assetgroup_list.html
+++ b/apps/assets/templates/assets/assetgroup_list.html
@@ -19,18 +19,18 @@
{% for assetgroup in assetgroups %}
<tr class="gradeX">
<td class="text-center">
- <input type="checkbox" name="checked" value="{{ user.id }}">
+ <input type="checkbox" name="checked" value="{{ assetgroup.id }}">
</td>
<td class="text-center">
- <a href="{% url 'assets:assetgroup-detail' pk=user.id %}">
+ <a href="{% url 'assets:assetgroup-detail' pk=assetgroup.id %}">
{{ assetgroup.name }}
</a>
</td>
- <td class="text-center">{{ assetgroup.comment }}</td>
+ <td class="text-center">{{ assetgroup.asset_set.count }}</td>
<td class="text-center">{{ assetgroup.comment }}</td>
<td class="text-center">
- <a href="{% url 'users:user-edit' pk=user.id %}" class="btn btn-xs btn-info">{% trans 'Edit' %}</a>
- <a href="{% url 'users:user-delete' pk=user.id %}" class="btn btn-xs btn-danger del {% if user.id == request.user.id or user.username == 'admin' %} disabled {% endif %}">{% trans 'Delete' %}</a>
+ <a href="{% url 'assets:assetgroup-edit' pk=assetgroup.id %}" class="btn btn-xs btn-info">{% trans 'Edit' %}</a>
+ <a href="{% url 'assets:assetgroup-delete' pk=assetgroup.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
</td>
</tr>
{% endfor %}
@@ -48,7 +48,7 @@
<div class="input-group-btn pull-left" style="padding-left: 5px;">
<button id='search_btn' type="submit" style="height: 32px;" class="btn btn-sm btn-primary">
- {% trans 'Commit' %}
+ {% trans 'Submit' %}
</button>
</div>
diff --git a/apps/assets/urls.py b/apps/assets/urls.py
index 8b92accb..53bf3bea 100644
--- a/apps/assets/urls.py
+++ b/apps/assets/urls.py
@@ -22,7 +22,7 @@ urlpatterns = [
url(r'^assetgroup$', views.AssetGroupListView.as_view(), name='assetgroup-list'),
url(r'^assetgroup/add$', views.AssetGroupAddView.as_view(), name='assetgroup-add'),
url(r'^assetgroup/(?P<pk>[0-9]+)$', views.AssetGroupDetailView.as_view(), name='assetgroup-detail'),
- url(r'^assetgroup/(?P<pk>[0-9]+)$/edit', views.AssetGroupEditView.as_view(), name='assetgroup-edit'),
+ url(r'^assetgroup/(?P<pk>[0-9]+)/edit$', views.AssetGroupEditView.as_view(), name='assetgroup-edit'),
url(r'^assetgroup/(?P<pk>[0-9]+)/delete$', views.AssetGroupDeleteView.as_view(), name='assetgroup-delete'),
# url(r'^api/v1.0/', include(router.urls)),
]
diff --git a/apps/assets/views.py b/apps/assets/views.py
index 246aeddf..7eb868a7 100644
--- a/apps/assets/views.py
+++ b/apps/assets/views.py
@@ -52,6 +52,7 @@ class AssetGroupAddView(CreateView):
model = AssetGroup
form_class = AssetGroupForm
template_name = 'assets/assetgroup_add.html'
+ success_url = reverse_lazy('assets:assetgroup-list')
def get_context_data(self, **kwargs):
context = {
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 012b6f01..66699be5 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -11,7 +11,7 @@
</div>
<ul class="nav navbar-top-links navbar-right">
<li>
- <span class="m-r-sm text-muted welcome-message">{% trans 'Welcome use Jumpserver system' %}</span>
+ <span class="m-r-sm text-muted welcome-message">{% trans 'Welcome to use Jumpserver system' %}</span>
</li>
<li class="dropdown">
<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
diff --git a/apps/users/locale/zh_CN/LC_MESSAGES/django.po b/apps/users/locale/zh_CN/LC_MESSAGES/django.po
index 6a39fce1..66649465 100644
--- a/apps/users/locale/zh_CN/LC_MESSAGES/django.po
+++ b/apps/users/locale/zh_CN/LC_MESSAGES/django.po
@@ -135,7 +135,7 @@ msgstr ""
#: users/templates/users/_user.html:70
#: users/templates/users/forget_password.html:44
#: users/templates/users/user_list.html:63
-msgid "Commit"
+msgid "Submit"
msgstr ""
#: users/templates/users/forget_password.html:26
diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html
index 60b3c229..61f9ba72 100644
--- a/apps/users/templates/users/_user.html
+++ b/apps/users/templates/users/_user.html
@@ -67,7 +67,7 @@
<div class="form-group">
<div class="col-sm-4 col-sm-offset-2">
<button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
- <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Commit' %}</button>
+ <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
</div>
</div>
</form>
diff --git a/apps/users/templates/users/forget_password.html b/apps/users/templates/users/forget_password.html
index 518850b1..efb0ed41 100644
--- a/apps/users/templates/users/forget_password.html
+++ b/apps/users/templates/users/forget_password.html
@@ -41,7 +41,7 @@
<input type="email" name="email" class="form-control" placeholder="Email address" required="">
</div>
- <button type="submit" class="btn btn-primary block full-width m-b">{% trans 'Commit' %}</button>
+ <button type="submit" class="btn btn-primary block full-width m-b">{% trans 'Submit' %}</button>
</form>
</div>
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index a2726736..51fbfa57 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -60,7 +60,7 @@
<div class="input-group-btn pull-left" style="padding-left: 5px;">
<button id='search_btn' type="submit" style="height: 32px;" class="btn btn-sm btn-primary">
- {% trans 'Commit' %}
+ {% trans 'Submit' %}
</button>
</div>
--
2.18.0