From 6069b8946b95dfec866cf2cae45d9a1b0ddc8570 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sat, 10 Sep 2016 00:29:57 +0800 Subject: [PATCH] Start asset extend --- apps/assets/models.py | 19 ++++++++++++++++++- apps/assets/urls.py | 9 +++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apps/assets/models.py b/apps/assets/models.py index 5ae270d0c..71a076d02 100644 --- a/apps/assets/models.py +++ b/apps/assets/models.py @@ -61,7 +61,24 @@ class AssetExtend(models.Model): comment = models.TextField(blank=True, verbose_name=_('Comment')) def __unicode__(self): - return self.name + return '%(key)s: %(value)s' % {'key': self.key, 'value': self.value} + + @classmethod + def initial(cls): + for k, v in ( + (_('status'), _('In use')), + (_('status'), _('Out of use')), + (_('type'), _('Server')), + (_('type'), _('VM')), + (_('type'), _('Switch')), + (_('type'), _('Router')), + (_('type'), _('Firewall')), + (_('type'), _('Storage')), + (_('env'), _('Production')), + (_('env'), _('Development')), + (_('env'), _('Testing')), + ): + cls.objects.create(key=k, value=v, created_by='System') class Meta: db_table = 'asset_extend' diff --git a/apps/assets/urls.py b/apps/assets/urls.py index ad2224048..175c01afc 100644 --- a/apps/assets/urls.py +++ b/apps/assets/urls.py @@ -12,27 +12,36 @@ import views app_name = 'assets' urlpatterns = [ + # Resource asset url url(r'^$', views.AssetListView.as_view(), name='asset-index'), url(r'^asset$', views.AssetListView.as_view(), name='asset-list'), url(r'^asset/create$', views.AssetCreateView.as_view(), name='asset-create'), url(r'^asset/(?P[0-9]+)$', views.AssetDetailView.as_view(), name='asset-detail'), url(r'^asset/(?P[0-9]+)/update', views.AssetUpdateView.as_view(), name='asset-update'), url(r'^asset/(?P[0-9]+)/delete$', views.AssetDeleteView.as_view(), name='asset-delete'), + + # Resource asset group url url(r'^asset-group$', views.AssetGroupListView.as_view(), name='asset-group-list'), url(r'^asset-group/create$', views.AssetGroupCreateView.as_view(), name='asset-group-create'), url(r'^asset-group/(?P[0-9]+)$', views.AssetGroupDetailView.as_view(), name='asset-group-detail'), url(r'^asset-group/(?P[0-9]+)/update$', views.AssetGroupUpdateView.as_view(), name='asset-group-update'), url(r'^asset-group/(?P[0-9]+)/delete$', views.AssetGroupDeleteView.as_view(), name='asset-group-delete'), + + # Resource idc url url(r'^idc$', views.IDCListView.as_view(), name='idc-list'), url(r'^idc/create$', views.IDCCreateView.as_view(), name='idc-create'), url(r'^idc/(?P[0-9]+)$', views.IDCDetailView.as_view(), name='idc-detail'), url(r'^idc/(?P[0-9]+)/update', views.IDCUpdateView.as_view(), name='idc-update'), url(r'^idc/(?P[0-9]+)/delete$', views.IDCDeleteView.as_view(), name='idc-delete'), + + # Resource admin user url url(r'^admin-user$', views.AdminUserListView.as_view(), name='admin-user-list'), url(r'^admin-user/create$', views.AdminUserCreateView.as_view(), name='admin-user-create'), url(r'^admin-user/(?P[0-9]+)$', views.AdminUserDetailView.as_view(), name='admin-user-detail'), url(r'^admin-user/(?P[0-9]+)/update', views.AdminUserUpdateView.as_view(), name='admin-user-update'), url(r'^admin-user/(?P[0-9]+)/delete$', views.AdminUserDeleteView.as_view(), name='admin-user-delete'), + + # Resource system user url url(r'^system-user$', views.SystemUserListView.as_view(), name='system-user-list'), url(r'^system-user/create$', views.SystemUserCreateView.as_view(), name='system-user-create'), url(r'^system-user/(?P[0-9]+)$', views.SystemUserDetailView.as_view(), name='system-user-detail'),