-
-
- {{ form.enable_otp }}
-
+ {% if form.non_field_errors %}
+
+ {{ form.non_field_errors }}
-
-
{% trans 'Profile' %}
- {{ form.phone|bootstrap_horizontal }}
- {{ form.wechat|bootstrap_horizontal }}
- {{ form.comment|bootstrap_horizontal }}
-
-
@@ -395,6 +400,13 @@ $(document).ready(function() {
);
};
APIUpdateAttr({ url: the_url, body: JSON.stringify(body), success: success, error: fail});
-});
+}).on('click', '.btn-delete-user', function () {
+ var $this = $(this);
+ var name = "{{ user.name }}";
+ var uid = "{{ user.id }}";
+ var the_url = '{% url "api-users:user-detail" pk=99991937 %}'.replace('99991937', uid);
+ var redirect_url = "{% url 'users:user-list' %}";
+ objectDelete($this, name, the_url, redirect_url);
+})
{% endblock %}
diff --git a/apps/users/templates/users/user_group_create_update.html b/apps/users/templates/users/user_group_create_update.html
index abb18a239..3b6814860 100644
--- a/apps/users/templates/users/user_group_create_update.html
+++ b/apps/users/templates/users/user_group_create_update.html
@@ -16,6 +16,11 @@
{{ action }}
+ {% if form.non_field_errors %}
+
+ {{ form.non_field_errors }}
+
+ {% endif %}
@@ -184,6 +189,13 @@ $(document).ready(function () {
});
console.log(users);
updateGroupMember(users)
+}).on('click', '.btn-delete-user-group', function () {
+ var $this = $(this);
+ var name = "{{ user_group.name }}";
+ var uid = "{{ user_group.id }}";
+ var the_url = '{% url "api-users:user-group-detail" pk=99991937 %}'.replace('99991937', uid);
+ var redirect_url = "{% url 'users:user-group-list' %}";
+ objectDelete($this, name, the_url, redirect_url);
})
{% endblock %}
diff --git a/apps/users/utils.py b/apps/users/utils.py
index 2f1da6924..fdff529d5 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -33,7 +33,7 @@ class AdminUserRequiredMixin(UserPassesTestMixin):
login_url = reverse_lazy('users:login')
def test_func(self):
- return self.request.user.is_staff
+ return self.request.user.is_superuser
def user_add_success_next(user):
@@ -122,61 +122,6 @@ def send_reset_ssh_key_mail(user):
send_mail_async.delay(subject, message, recipient_list, html_message=message)
-# def validate_ssh_pk(text):
-# """
-# Expects a SSH private key as string.
-# Returns a boolean and a error message.
-# If the text is parsed as private key successfully,
-# (True,'') is returned. Otherwise,
-# (False, ) is returned.
-#
-# from https://github.com/githubnemo/SSH-private-key-validator/blob/master/validate.py
-#
-# """
-#
-# if not text:
-# return False, 'No text given'
-#
-# startPattern = re.compile("^-----BEGIN [A-Z]+ PRIVATE KEY-----")
-# optionPattern = re.compile("^.+: .+")
-# contentPattern = re.compile("^([a-zA-Z0-9+/]{64}|[a-zA-Z0-9+/]{1,64}[=]{0,2})$")
-# endPattern = re.compile("^-----END [A-Z]+ PRIVATE KEY-----")
-#
-# def contentState(text):
-# for i in range(0, len(text)):
-# line = text[i]
-#
-# if endPattern.match(line):
-# if i == len(text) - 1 or len(text[i + 1]) == 0:
-# return True, ''
-# else:
-# return False, 'At end but content coming'
-#
-# elif not contentPattern.match(line):
-# return False, 'Wrong string in content section'
-#
-# return False, 'No content or missing end line'
-#
-# def optionState(text):
-# for i in range(0, len(text)):
-# line = text[i]
-#
-# if line[-1:] == '\\':
-# return optionState(text[i + 2:])
-#
-# if not optionPattern.match(line):
-# return contentState(text[i + 1:])
-#
-# return False, 'Expected option, found nothing'
-
- # def startState(text):
- # if len(text) == 0 or not startPattern.match(text[0]):
- # return False, 'Header is wrong'
- # return optionState(text[1:])
- #
- # return startState([n.strip() for n in text.splitlines()])
-#
-
def check_user_valid(**kwargs):
password = kwargs.pop('password', None)
public_key = kwargs.pop('public_key', None)
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index 8a2df396e..61859adcd 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -118,13 +118,14 @@ class UserDetailView(AdminUserRequiredMixin, DetailView):
@method_decorator(csrf_exempt, name='dispatch')
class UserExportView(View):
- def get(self, request, *args, **kwargs):
+ def get(self, request):
spm = request.GET.get('spm', '')
users_id = cache.get(spm)
if not users_id and not isinstance(users_id, list):
return HttpResponse('May be expired', status=404)
users = User.objects.filter(id__in=users_id)
+ print(users)
wb = Workbook()
ws = wb.active
ws.title = 'User'
@@ -133,9 +134,12 @@ class UserExportView(View):
ws.append(header)
for user in users:
- ws.append([user.name, user.username, user.email,
- ','.join([group.name for group in user.groups.all()]),
- user.role, user.phone, user.wechat, user.comment])
+ print(user.name)
+ ws.append([
+ user.name, user.username, user.email,
+ ','.join([group.name for group in user.groups.all()]),
+ user.role, user.phone, user.wechat, user.comment,
+ ])
filename = 'users-{}.xlsx'.format(
timezone.localtime(timezone.now()).strftime('%Y-%m-%d_%H-%M-%S'))
@@ -144,7 +148,7 @@ class UserExportView(View):
response['Content-Disposition'] = 'attachment; filename="%s"' % filename
return response
- def post(self, request, *args, **kwargs):
+ def post(self, request):
try:
users_id = json.loads(request.body).get('users_id', [])
except ValueError:
@@ -180,11 +184,13 @@ class UserBulkImportView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
return self.render_json_response(data)
rows = ws.rows
- header_need = ["name", 'username', 'email', 'groups', "role", "phone", "wechat", "comment"]
+ header_need = ["name", 'username', 'email', 'groups',
+ "role", "phone", "wechat", "comment"]
header = [col.value for col in next(rows)]
print(header)
if header != header_need:
- data = {'valid': False, 'msg': 'Must be same format as template or export file'}
+ data = {'valid': False, 'msg': 'Must be same format as '
+ 'template or export file'}
return self.render_json_response(data)
created = []
diff --git a/config_example.py b/config_example.py
index 13fb382b9..2a528fbc3 100644
--- a/config_example.py
+++ b/config_example.py
@@ -18,8 +18,8 @@ class Config:
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = os.environ.get('SECRET_KEY') or '2vym+ky!997d5kkcc64mnz06y1mmui3lut#(^wd=%s_qj$1%x'
- # How many line display every page, default 20
- DISPLAY_PER_PAGE = 20
+ # How many line display every page, default 25
+ DISPLAY_PER_PAGE = 25
# It's used to identify your site, When we send a create mail to user, we only know login url is /login/
# But we should know the absolute url like: http://jms.jumpserver.org/login/, so SITE_URL is