Skip to content

J
jumpserver
Commit 7b99a33a authored by ibuler's avatar ibuler
Browse files
Options

permission update and delete finished

parent 6d736d73
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 55 deletions
apps/perms/templates/perms/asset_permission_list.html
View file @ 7b99a33a
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
{% endif %} {% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="" class="btn btn-xs btn-info">{% trans 'Update' %}</a> <a href="{% url 'perms:asset-permission-update' pk=permission.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
<a href="" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a> <a href="{% url 'perms:asset-permission-delete' pk=permission.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
......
apps/perms/templates/perms/delete_confirm.html 0 → 100644
View file @ 7b99a33a
{% load i18n %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{% trans 'Confirm delete' %}</title>
</head>
<body>
<form action="" method="post">
{% csrf_token %}
<p>Are you sure you want to delete "{{ object.name }}"?</p>
<input type="submit" value="Confirm" />
</form>
</body>
</html>
\ No newline at end of file
apps/perms/urls.py
View file @ 7b99a33a
...@@ -6,7 +6,13 @@ import views ...@@ -6,7 +6,13 @@ import views
app_name = 'perms' app_name = 'perms'
urlpatterns = [ urlpatterns = [
url(r'^asset-permission$', views.UserAssetPermissionListView.as_view(), name='asset-permission-list'), url(r'^asset-permission$', views.AssetPermissionListView.as_view(), name='asset-permission-list'),
url(r'^asset-permission/create$', views.UserAssetPermissionCreateView.as_view(), name='asset-permission-create'), url(r'^asset-permission/create$', views.AssetPermissionCreateView.as_view(), name='asset-permission-create'),
url(r'^asset-permission/(?P<pk>[0-9]+)/update$', views.AssetPermissionUpdateView.as_view(),
name='asset-permission-update'),
url(r'^asset-permission/(?P<pk>[0-9]+)$', views.AssetPermissionDetailView.as_view(),
name='asset-permission-detail'),
url(r'^asset-permission/(?P<pk>[0-9]+)/delete$', views.AssetPermissionDeleteView.as_view(),
name='asset-permission-delete'),
] ]
apps/perms/views.py
View file @ 7b99a33a
...@@ -16,7 +16,7 @@ from .models import AssetPermission ...@@ -16,7 +16,7 @@ from .models import AssetPermission
from .forms import AssetPermissionForm from .forms import AssetPermissionForm
class UserAssetPermissionListView(AdminUserRequiredMixin, ListView): class AssetPermissionListView(AdminUserRequiredMixin, ListView):
model = AssetPermission model = AssetPermission
paginate_by = settings.CONFIG.DISPLAY_PER_PAGE paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
context_object_name = 'asset_permission_list' context_object_name = 'asset_permission_list'
...@@ -29,11 +29,11 @@ class UserAssetPermissionListView(AdminUserRequiredMixin, ListView): ...@@ -29,11 +29,11 @@ class UserAssetPermissionListView(AdminUserRequiredMixin, ListView):
'keyword': self.request.GET.get('keyword', '') 'keyword': self.request.GET.get('keyword', '')
} }
kwargs.update(context) kwargs.update(context)
return super(UserAssetPermissionListView, self).get_context_data(**kwargs) return super(AssetPermissionListView, self).get_context_data(**kwargs)
def get_queryset(self): def get_queryset(self):
# Todo: Default order by lose asset connection num # Todo: Default order by lose asset connection num
self.queryset = super(UserAssetPermissionListView, self).get_queryset() self.queryset = super(AssetPermissionListView, self).get_queryset()
self.keyword = keyword = self.request.GET.get('keyword', '') self.keyword = keyword = self.request.GET.get('keyword', '')
self.sort = sort = self.request.GET.get('sort', '-date_created') self.sort = sort = self.request.GET.get('sort', '-date_created')
...@@ -53,12 +53,12 @@ class UserAssetPermissionListView(AdminUserRequiredMixin, ListView): ...@@ -53,12 +53,12 @@ class UserAssetPermissionListView(AdminUserRequiredMixin, ListView):
return self.queryset return self.queryset
class UserAssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): class AssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
model = AssetPermission model = AssetPermission
form_class = AssetPermissionForm form_class = AssetPermissionForm
template_name = 'perms/asset_permission_create.html' template_name = 'perms/asset_permission_create_update.html'
success_url = reverse_lazy('perms:asset-permission-list') success_url = reverse_lazy('perms:asset-permission-list')
success_message = _('Create asset <a href="%s"> %s </a> perm successfully.') success_message = _('Create asset permission <a href="%s"> %s </a> successfully.')
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = { context = {
...@@ -66,48 +66,49 @@ class UserAssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin, ...@@ -66,48 +66,49 @@ class UserAssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin,
'action': _('Create asset permission'), 'action': _('Create asset permission'),
} }
kwargs.update(context) kwargs.update(context)
return super(UserAssetPermissionCreateView, self).get_context_data(**kwargs) return super(AssetPermissionCreateView, self).get_context_data(**kwargs)
# def get_success_message(self, cleaned_data): def get_success_message(self, cleaned_data):
# return self.success_message % ( return self.success_message % (
# reverse_lazy('perms:asset-permission-list', kwargs={'pk': self.object.pk}) reverse_lazy('perms:asset-permission-detail', kwargs={'pk': self.object.pk}),
# ) self.object.name,
)
# class PermUserAssetUpdateView(AdminUserRequiredMixin, UpdateView):
# model = PermUserAsset class AssetPermissionUpdateView(AdminUserRequiredMixin, UpdateView):
# form_class = PermUserAssetForm model = AssetPermission
# template_name = 'assets/system_user_create_update.html' form_class = AssetPermissionForm
# success_message = _('Update system user <a href="%s">%s</a> successfully.') template_name = 'perms/asset_permission_create_update.html'
# success_message = _('Update asset permission <a href="%s"> %s </a> successfully.')
# def get_context_data(self, **kwargs):
# context = { def get_context_data(self, **kwargs):
# 'app': _('Assets'), context = {
# 'action': _('Update system user') 'app': _('Perms'),
# } 'action': _('Update asset permission')
# kwargs.update(context) }
# return super(PermUserAssetUpdateView, self).get_context_data(**kwargs) kwargs.update(context)
# return super(AssetPermissionUpdateView, self).get_context_data(**kwargs)
# def get_success_url(self):
# success_url = reverse_lazy('assets:system-user-detail', pk=self.object.pk) def get_success_url(self):
# return success_url success_url = reverse_lazy('perms:asset-permission-detail', kwargs={'pk': self.object.pk})
# return success_url
#
# class PermUserAssetDetailView(AdminUserRequiredMixin, DetailView):
# template_name = 'assets/system_user_detail.html' class AssetPermissionDetailView(AdminUserRequiredMixin, DetailView):
# context_object_name = 'system_user' template_name = 'assets/system_user_detail.html'
# model = PermUserAsset context_object_name = 'system_user'
# model = AssetPermission
# def get_context_data(self, **kwargs):
# context = { def get_context_data(self, **kwargs):
# 'app': _('Assets'), context = {
# 'action': _('System user detail') 'app': _('Assets'),
# } 'action': _('System user detail')
# kwargs.update(context) }
# return super(PermUserAssetDetailView, self).get_context_data(**kwargs) kwargs.update(context)
# return super(AssetPermissionDetailView, self).get_context_data(**kwargs)
#
# class PermUserAssetDeleteView(AdminUserRequiredMixin, DeleteView):
# model = PermUserAsset class AssetPermissionDeleteView(AdminUserRequiredMixin, DeleteView):
# template_name = 'assets/delete_confirm.html' model = AssetPermission
# success_url = 'assets:system-user-list' template_name = 'perms/delete_confirm.html'
success_url = reverse_lazy('perms:asset-permission-list')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment