From 88d09568efc69901d4e12f62021239096f8d69f8 Mon Sep 17 00:00:00 2001 From: lombardofr Date: Tue, 11 Sep 2018 18:14:39 +0200 Subject: [PATCH] [WIP] user editing Change-Id: I0cb42614bb750d95bd03376924cf8c85d60cb2b7 --- lib/osm/osmclient/clientv2.py | 19 +++ static/src/userhandler/user_list.js | 54 +++++- userhandler/templates/modal/user_create.html | 2 +- userhandler/templates/modal/user_edit.html | 17 +- userhandler/templates/user_list.html | 169 +++++++++++-------- userhandler/urls.py | 3 +- userhandler/views.py | 16 ++ 7 files changed, 200 insertions(+), 80 deletions(-) diff --git a/lib/osm/osmclient/clientv2.py b/lib/osm/osmclient/clientv2.py index 482ff07..fa4117e 100644 --- a/lib/osm/osmclient/clientv2.py +++ b/lib/osm/osmclient/clientv2.py @@ -107,6 +107,25 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def user_update(self, token, id, user_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/users/{1}".format(self._base_path, id) + print _url + print user_data + try: + r = requests.post(_url, json=user_data, verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code == requests.codes.created: + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + def user_delete(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", diff --git a/static/src/userhandler/user_list.js b/static/src/userhandler/user_list.js index 88f4770..0c53b9e 100644 --- a/static/src/userhandler/user_list.js +++ b/static/src/userhandler/user_list.js @@ -1,6 +1,5 @@ function openModalCreateUser(args) { - console.log(args) - // load projects list + select2_groups = $('#projects').select2({ placeholder: 'Select Projects', width: '100%', @@ -26,6 +25,57 @@ function openModalCreateUser(args) { $('#modal_new_user').modal('show'); } +function openModalEditUser(args) { + var url = '/admin/users/'+args.user_id; + console.log(url) + $("#formEditUser").attr("action", url); + select2_groups = $('#projects_edit').select2({ + placeholder: 'Select Projects', + width: '100%', + ajax: { + url: '/projects/list', + dataType: 'json', + processResults: function (data) { + projects = []; + if (data['projects']) { + for (d in data['projects']) { + var project = data['projects'][d]; + projects.push({id: project['_id'], text: project['name']}) + } + } + + return { + results: projects + }; + } + } + }); + + select2_single = $('#default_project_edit').select2({ + placeholder: 'Select Default Project', + width: '100%', + ajax: { + url: '/projects/list', + dataType: 'json', + processResults: function (data) { + projects = []; + if (data['projects']) { + for (d in data['projects']) { + var project = data['projects'][d]; + projects.push({id: project['_id'], text: project['name']}) + } + } + + return { + results: projects + }; + } + } + }); + + $('#modal_edit_user').modal('show'); +} + function deleteUser(user_id, name) { var delete_url = '/admin/users/'+user_id+'/delete'; bootbox.confirm("Are you sure want to delete "+name+"?", function (confirm) { diff --git a/userhandler/templates/modal/user_create.html b/userhandler/templates/modal/user_create.html index 7967cc6..21afce0 100644 --- a/userhandler/templates/modal/user_create.html +++ b/userhandler/templates/modal/user_create.html @@ -6,7 +6,7 @@

New User

-
{% csrf_token %} diff --git a/userhandler/templates/modal/user_edit.html b/userhandler/templates/modal/user_edit.html index b278e22..d3c3d38 100644 --- a/userhandler/templates/modal/user_edit.html +++ b/userhandler/templates/modal/user_edit.html @@ -4,32 +4,31 @@
-

New User

+

Edit User

- {% csrf_token %}
- +
-
-
- +
- +
-
diff --git a/userhandler/templates/user_list.html b/userhandler/templates/user_list.html index 621df92..b83ec32 100644 --- a/userhandler/templates/user_list.html +++ b/userhandler/templates/user_list.html @@ -26,6 +26,8 @@ {{ block.super }} {% include 'modal/user_details.html' %} {% include 'modal/user_create.html' %} + {% include 'modal/user_edit.html' %} + {% csrf_token %}
@@ -35,10 +37,11 @@

Users

+ Create User +
@@ -50,13 +53,11 @@ Projects Identifier Modified - Created + Created Actions - -
@@ -73,77 +74,111 @@ diff --git a/userhandler/urls.py b/userhandler/urls.py index 05d88f0..9b07f43 100644 --- a/userhandler/urls.py +++ b/userhandler/urls.py @@ -20,6 +20,7 @@ from userhandler import views urlpatterns = [ url(r'^list$', views.list, name='list'), url(r'^create$', views.create, name='create'), - url(r'^(?P[0-9a-zA-Z]+)/delete$', views.delete, name='delete'), + url(r'^(?P[0-9a-zA-Z]+)', views.update, name='update'), + url(r'^(?P[0-9a-zA-Z]+)/delete$', views.delete, name='delete') ] \ No newline at end of file diff --git a/userhandler/views.py b/userhandler/views.py index aa0d8d2..05d5925 100644 --- a/userhandler/views.py +++ b/userhandler/views.py @@ -46,6 +46,22 @@ def delete(request, user_id=None): log.exception(e) return __response_handler(request, {}, 'users:list', to_redirect=True, ) +@login_required +def update(request, user_id=None): + user = osmutils.get_user(request) + try: + client = Client() + user_data = { + "projects": request.POST.getlist('projects') + } + print user_data + update_res = client.user_update(user.get_token(), user_id, user_data) + except Exception as e: + log.exception(e) + return __response_handler(request, {}, 'users:list', to_redirect=True, ) + + + def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs): raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') -- 2.25.1