-
+{% block form %}
+
-
{% endblock %}
-{% block modal_confirm_id %}btn_user_bulk_update{% endblock %}
+{% endblock %}
+{#{% block custom_foot_js %}#}
+{##}
+{#{% endblock %}#}
diff --git a/apps/users/templates/users/user_bulk_update.html b/apps/users/templates/users/user_bulk_update.html
new file mode 100644
index 000000000..a1ddc6e39
--- /dev/null
+++ b/apps/users/templates/users/user_bulk_update.html
@@ -0,0 +1,69 @@
+{% extends '_base_create_update.html' %}
+{% load static %}
+{% load bootstrap3 %}
+{% load i18n %}
+
+{% block form %}
+
+
+{% endblock %}
+
+{% block custom_foot_js %}
+
+{% endblock %}
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index 01bb473f2..b7fcde217 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -55,6 +55,22 @@
{% block custom_foot_js %}
{% endblock %}
diff --git a/apps/users/urls/views_urls.py b/apps/users/urls/views_urls.py
index a60f3a764..23ab12012 100644
--- a/apps/users/urls/views_urls.py
+++ b/apps/users/urls/views_urls.py
@@ -22,14 +22,11 @@ urlpatterns = [
name='reset-password-success'),
# Profile
- url(r'^profile/$',
- views.UserProfileView.as_view(),
+ url(r'^profile/$', views.UserProfileView.as_view(),
name='user-profile'),
- url(r'^profile/update/$',
- views.UserProfileUpdateView.as_view(),
+ url(r'^profile/update/$', views.UserProfileUpdateView.as_view(),
name='user-profile-update'),
- url(r'^profile/password/update/$',
- views.UserPasswordUpdateView.as_view(),
+ url(r'^profile/password/update/$', views.UserPasswordUpdateView.as_view(),
name='user-password-update'),
url(r'^profile/pubkey/update/$',
views.UserPublicKeyUpdateView.as_view(),
@@ -48,37 +45,29 @@ urlpatterns = [
url(r'^user/(?P
[0-9]+)/assets',
views.UserGrantedAssetView.as_view(),
name='user-granted-asset'),
- url(r'^user/(?P[0-9]+)/login-history',
- views.UserDetailView.as_view(),
+ url(r'^user/(?P[0-9]+)/login-history', views.UserDetailView.as_view(),
name='user-login-history'),
- url(r'^user/export/',
- views.UserExportView.as_view(),
+ url(r'^user/export/', views.UserExportView.as_view(),
name='user-export'),
- url(r'^first-login/$',
- views.UserFirstLoginView.as_view(),
+ url(r'^first-login/$', views.UserFirstLoginView.as_view(),
name='user-first-login'),
- url(r'^user/import/$',
- views.UserBulkImportView.as_view(),
+ url(r'^user/import/$', views.UserBulkImportView.as_view(),
name='user-import'),
- url(r'^user/create$',
- views.UserCreateView.as_view(),
+ url(r'^user/create$', views.UserCreateView.as_view(),
name='user-create'),
- url(r'^user/(?P[0-9]+)/update$',
- views.UserUpdateView.as_view(),
+ url(r'^user/(?P[0-9]+)/update$', views.UserUpdateView.as_view(),
name='user-update'),
+ url(r'^user/update$', views.UserBulkUpdateView.as_view(),
+ name='user-bulk-update'),
# User group view
- url(r'^user-group$',
- views.UserGroupListView.as_view(),
+ url(r'^user-group$', views.UserGroupListView.as_view(),
name='user-group-list'),
- url(r'^user-group/(?P[0-9]+)$',
- views.UserGroupDetailView.as_view(),
+ url(r'^user-group/(?P[0-9]+)$', views.UserGroupDetailView.as_view(),
name='user-group-detail'),
- url(r'^user-group/create$',
- views.UserGroupCreateView.as_view(),
+ url(r'^user-group/create$', views.UserGroupCreateView.as_view(),
name='user-group-create'),
- url(r'^user-group/(?P[0-9]+)/update$',
- views.UserGroupUpdateView.as_view(),
+ url(r'^user-group/(?P[0-9]+)/update$', views.UserGroupUpdateView.as_view(),
name='user-group-update'),
url(r'^user-group/(?P[0-9]+)/asset-permission$',
views.UserGroupAssetPermissionView.as_view(),
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index 7a09353be..9a7ab4d3c 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -38,7 +38,7 @@ __all__ = ['UserListView', 'UserCreateView', 'UserDetailView',
'UserAssetPermissionView', 'UserGrantedAssetView',
'UserExportView', 'UserBulkImportView', 'UserProfileView',
'UserProfileUpdateView', 'UserPasswordUpdateView',
- 'UserPublicKeyUpdateView',
+ 'UserPublicKeyUpdateView', 'UserBulkUpdateView',
]
logger = get_logger(__name__)
@@ -107,6 +107,46 @@ class UserUpdateView(AdminUserRequiredMixin, UpdateView):
return context
+class UserBulkUpdateView(AdminUserRequiredMixin, ListView):
+ model = User
+ form_class = forms.UserBulkUpdateForm
+ template_name = 'users/user_bulk_update.html'
+ success_url = reverse_lazy('users:user-list')
+
+ def get(self, request, *args, **kwargs):
+ users_id = self.request.GET.get('users_id', '')
+ self.id_list = [int(i) for i in users_id.split(',') if i.isdigit()]
+
+ if kwargs.get('form'):
+ self.form = kwargs['form']
+ elif users_id:
+ self.form = self.form_class(
+ initial={'users': self.id_list}
+ )
+ else:
+ self.form = self.form_class()
+ return super(UserBulkUpdateView, self).get(request, *args, **kwargs)
+
+ def post(self, request, *args, **kwargs):
+ form = self.form_class(request.POST)
+ if form.is_valid():
+ form.save()
+ return redirect(self.success_url)
+ else:
+ return self.get(request, form=form, *args, **kwargs)
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': 'Assets',
+ 'action': 'Bulk update asset',
+ 'form': self.form,
+ 'users_selected': self.id_list,
+ 'users': User.objects.all(),
+ }
+ kwargs.update(context)
+ return super(UserBulkUpdateView, self).get_context_data(**kwargs)
+
+
class UserDetailView(AdminUserRequiredMixin, DetailView):
model = User
template_name = 'users/user_detail.html'