improved role management
Change-Id: Iaf87385269b2195ba964a951939deca6be938013
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/rolehandler/templates/modal/role_create.html b/rolehandler/templates/modal/role_create.html
index 58d68ca..d8282a7 100644
--- a/rolehandler/templates/modal/role_create.html
+++ b/rolehandler/templates/modal/role_create.html
@@ -17,9 +17,22 @@
<input class="form-control" id="rolename" name="name"
placeholder="Name" required>
</div>
+
</div>
-
-
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div class="checkbox">
+ <label><input type="checkbox" id="create_root" name="root"> Root</label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="definition" class="col-sm-3 control-label">Definition </label>
+ <div class="col-sm-6">
+ <textarea class="form-control" id="definition" name="definition" placeholder="Yaml definition"
+ rows="3"></textarea>
+ </div>
+ </div>
</div>
<div class="modal-footer">
diff --git a/rolehandler/templates/modal/role_edit.html b/rolehandler/templates/modal/role_edit.html
index 8541177..ca3c4c0 100644
--- a/rolehandler/templates/modal/role_edit.html
+++ b/rolehandler/templates/modal/role_edit.html
@@ -14,10 +14,26 @@
<div class="modal-body" id="modal_edit_role_body">
<div class="form-group">
- <label for="name" class="col-sm-3 control-label">Name</label>
+ <label for="rolename" class="col-sm-3 control-label">Name *</label>
<div class="col-sm-6">
- <input class="form-control" id="edit_role_name" name="role"
- placeholder="Name">
+ <input class="form-control" type="text" id="edit_rolename" name="name"
+ placeholder="Name" required>
+ </div>
+
+ </div>
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div class="checkbox">
+ <label><input type="checkbox" id="edit_root" name="root"> Root</label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="definition" class="col-sm-3 control-label">Definition </label>
+ <div class="col-sm-6">
+ <textarea class="form-control" id="edit_definition" name="definition" placeholder="Yaml definition"
+ rows="3"></textarea>
</div>
</div>
diff --git a/rolehandler/templates/role_list.html b/rolehandler/templates/role_list.html
index 5cf49a1..bfc7566 100644
--- a/rolehandler/templates/role_list.html
+++ b/rolehandler/templates/role_list.html
@@ -19,7 +19,7 @@
{% block breadcrumb_body %}
{{ block.super }}
- <li><a href="#">roles</a></li>
+ <li><a href="#">Roles</a></li>
{% endblock %}
{% block content_body %}
@@ -33,10 +33,10 @@
<div class="box">
<div class="box-header with-border">
- <h3 class="box-title">roles</h3>
+ <h3 class="box-title">Roles</h3>
<div class="box-tools">
<button type="button" class="btn btn-default" data-container="body"
- onclick="javascript:openModalCreateRole({'projects_list_url': '{% url "projects:projects_list" %}'})"
+ onclick="javascript:openModalCreateRole()"
data-toggle="tooltip" data-placement="top" title="New role">
<i class="fa fa-plus"></i> Create role
@@ -128,9 +128,9 @@
'data-toggle="dropdown" aria-expanded="false">Actions ' +
'<span class="fa fa-caret-down"></span></button> ' +
'<ul class="dropdown-menu">' +
- '<li> <a href="#" onclick="javascript:openModalEditRole({role_id:\'' + row['_id'] + '\', rolename:\'' + row['rolename'] + '\'})">' +
+ '<li> <a href="#" onclick="javascript:openModalEditRole({role_id:\'' + row['_id'] + '\'})">' +
'<i class="fa fa-edit"></i> Edit</a></li>' +
- '<li> <a href="#" onclick="javascript:deleteRole(\'' + row['_id'] + '\', \'' + row['rolename'] + '\')"' +
+ '<li> <a href="#" onclick="javascript:deleteRole(\'' + row['_id'] + '\', \'' + row['name'] + '\')"' +
'style="color:red"><i class="fa fa-trash"></i> Delete</a></li> </ul></div>';
},
"targets": 4,
@@ -197,7 +197,7 @@
table.ajax.reload();
bootbox.alert({
title: "Result",
- message: "role successfully modified."
+ message: "Role successfully modified."
});
}).fail(function (result) {