user edit - change password
Change-Id: Iab1efe49f69200dd262fff2b07468d2dcc0ebe66
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/userhandler/templates/modal/user_edit.html b/userhandler/templates/modal/user_edit.html
index caeeb3a..21dbe8a 100644
--- a/userhandler/templates/modal/user_edit.html
+++ b/userhandler/templates/modal/user_edit.html
@@ -20,6 +20,13 @@
</div>
</div>{% endcomment %}
<div class="form-group">
+ <label for="password" class="col-sm-3 control-label">New Password</label>
+ <div class="col-sm-6">
+ <input class="form-control" id="edit_password" name="password" type="password"
+ placeholder="Password">
+ </div>
+ </div>
+ <div class="form-group">
<label for=projects" class="col-sm-3 control-label">Default project *</label>
<div class="col-sm-6">
<select required id="default_project_edit" class="js-example-basic form-control" name="default_project">
diff --git a/userhandler/urls.py b/userhandler/urls.py
index 2bd735b..6447d69 100644
--- a/userhandler/urls.py
+++ b/userhandler/urls.py
@@ -20,7 +20,7 @@
urlpatterns = [
url(r'^list$', views.user_list, name='list'),
url(r'^create$', views.create, name='create'),
- url(r'^(?P<user_id>[0-9a-zA-Z]+)', views.update, name='update'),
- url(r'^(?P<user_id>[0-9a-zA-Z]+)/delete$', views.delete, name='delete')
+ url(r'^(?P<user_id>[0-9a-zA-Z]+)/delete$', views.delete, name='delete'),
+ url(r'^(?P<user_id>[0-9a-zA-Z]+)', views.update, name='update')
-]
\ No newline at end of file
+]
diff --git a/userhandler/views.py b/userhandler/views.py
index 3aa227a..a7c014d 100644
--- a/userhandler/views.py
+++ b/userhandler/views.py
@@ -58,20 +58,31 @@
projects_to_add = list(set(projects_new) - set(projects_old))
projects_to_remove = list(set(projects_old) - set(projects_new))
- payload = {}
+ project_payload = {}
for p in projects_to_remove:
- payload["$"+str(p)] = None
+ project_payload["$"+str(p)] = None
for p in projects_to_add:
if p not in projects_old:
- payload["$+"+str(p)] = str(p)
- payload["$" + default_project] = None
- payload["$+[0]"] = default_project
+ project_payload["$+"+str(p)] = str(p)
+ project_payload["$" + default_project] = None
+ project_payload["$+[0]"] = default_project
+ payload = {}
+ if project_payload:
+ payload["projects"] = project_payload
+ if request.POST.get('password') and request.POST.get('password') is not '':
+ payload["password"] = request.POST.get('password')
- update_res = client.user_update(user.get_token(), user_id, {"projects": payload})
+ update_res = client.user_update(user.get_token(), user_id, payload)
except Exception as e:
log.exception(e)
- return __response_handler(request, {}, 'users:list', to_redirect=True, )
+ update_res = {'error': True, 'data': str(e)}
+ if update_res['error']:
+ return __response_handler(request, update_res['data'], url=None,
+ status=update_res['data']['status'] if 'status' in update_res['data'] else 500)
+ else:
+ return __response_handler(request, {}, url=None, status=200)
+ #return __response_handler(request, {}, 'users:list', to_redirect=True, )
def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):