X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=userhandler%2Ftemplates%2Fuser_list.html;fp=userhandler%2Ftemplates%2Fuser_list.html;h=b287b76bf7c5bb23cc9aa85784ceb2350442944a;hb=5bc5ebbb3fe574a5699c580594808cee44a4e0b3;hp=361784c7888887933a0fd50a44b28848f36d39d0;hpb=756fff4cdf8bfdac47feda544a13b675d96d4ead;p=osm%2FLW-UI.git
diff --git a/userhandler/templates/user_list.html b/userhandler/templates/user_list.html
index 361784c..b287b76 100644
--- a/userhandler/templates/user_list.html
+++ b/userhandler/templates/user_list.html
@@ -1,3 +1,18 @@
+
{% extends "base.html" %}
{% load get %}
{% load date_tag %}
@@ -26,7 +41,9 @@
{{ block.super }}
{% include 'modal/user_details.html' %}
{% include 'modal/user_create.html' %}
- {% include 'modal/user_edit.html' %}
+ {% include 'modal/user_credentials_edit.html' %}
+ {% include 'modal/user_proj_role_edit.html' %}
+
{% csrf_token %}
@@ -50,7 +67,6 @@
Name |
- Projects |
Identifier |
Modified |
Created |
@@ -105,27 +121,22 @@
},
{
"render": function (data, type, row) {
- return row['projects'];
- },
- "targets": 1
- },
- {
- "render": function (data, type, row) {
+
return row['_id'];
},
- "targets": 2
+ "targets": 1
},
{
"render": function (data, type, row) {
return moment.unix(row["_admin"]['modified']).format('YYYY-MM-DD hh:mm:ss a');
},
- "targets": 3
+ "targets": 2
},
{
"render": function (data, type, row) {
return moment.unix(row["_admin"]['created']).format('YYYY-MM-DD hh:mm:ss a');
},
- "targets": 4
+ "targets": 3
},
{
"render": function (data, type, row) {
@@ -134,17 +145,19 @@
'data-toggle="dropdown" aria-expanded="false">Actions ' +
' ' +
'';
},
- "targets": 5,
+ "targets": 4,
"orderable": false
}
]
});
-
+ /*
var select2_groups = $('#projects_edit').select2({
placeholder: 'Select Projects',
width: '100%',
@@ -169,8 +182,8 @@
};
}
}
- });
-
+ });*/
+ /*
var select2_single = $('#default_project_edit').select2({
placeholder: 'Select Default Project',
width: '100%',
@@ -194,7 +207,7 @@
};
}
}
- });
+ });*/
setInterval(function () {
table.ajax.reload();
@@ -250,7 +263,7 @@
contentType: false,
processData: false
}).done(function (response, textStatus, jqXHR) {
- $('#modal_edit_user').modal('hide');
+ $('#modal_edit_user_credentials').modal('hide');
table.ajax.reload();
bootbox.alert({
title: "Result",
@@ -268,6 +281,11 @@
});
});
+ $("#password2").keyup(validatePswOnCreate);
+ $("#edit_password2").keyup(validatePswOnEdit);
+
+ $(document).on('click', '.proj-role-map-group-head .btn-add', addMapGroup);
+ $(document).on('click', '.proj-role-map-group .btn-remove', removeMapGroup);
});