Merge remote-tracking branch 'melina/updatePassword'

root 2021-06-03 19:13:25 +02:00
commit 6a04b24259
4 changed files with 139 additions and 113 deletions

View File

@ -266,4 +266,87 @@ $(document).ready(function() {
}},
]
} );
$template = $(".template-detail-users");
$('#users').find('tbody').on('click', 'td.details-control', function () {
var tr = $(this).closest('tr');
var row = table.row( tr );
if ( row.child.isShown() ) {
// This row is already open - close it
row.child.hide();
tr.removeClass('shown');
}
else {
// Close other rows
if ( table.row( '.shown' ).length ) {
$('.details-control', table.row( '.shown' ).node()).click();
}
// Open this row
row.child( addUserDetailPannel(row.data()) ).show();
tr.addClass('shown');
actionsUserDetail()
}
} );
function addUserDetailPannel ( d ) {
$newPanel = $template.clone();
$newPanel.html(function(i, oldHtml){
return oldHtml.replace(/d.id/g, d.id).replace(/d.username/g, d.username);
});
return $newPanel
}
function actionsUserDetail(){
$('.btn-passwd').on('click', function () {
var closest=$(this).closest("div").parent();
var pk=closest.attr("data-pk");
$("#modalPasswdUserForm")[0].reset();
$('#modalPasswdUser').modal({
backdrop: 'static',
keyboard: false
}).modal('show');
$('#modalPasswdUserForm #id').val(pk);
});
$("#modalPasswdUser #send").on('click', function(e){
var form = $('#modalPasswdUserForm');
form.parsley().validate();
if (form.parsley().isValid()){
data=$('#modalPasswdUserForm').serializeObject();
data['id']=$('#modalPasswdUserForm #id').val();
console.log('Editing user password...')
console.log(data)
}
});
$('.btn-delete').on('click', function () {
var closest=$(this).closest("div").parent();
var pk=closest.attr("data-pk");
var username=closest.attr("data-username");
console.log(username)
new PNotify({
title: 'Confirmation Needed',
text: "Are you sure you want to delete the user: "+ username+"?",
hide: false,
opacity: 0.9,
confirm: {
confirm: true
},
buttons: {
closer: false,
sticker: false
},
history: {
history: false
},
addclass: 'pnotify-center'
}).get().on('pnotify.confirm', function() {
console.log('Deleting user...')
}).on('pnotify.cancel', function() {
});
});
}
});

View File

@ -98,3 +98,43 @@
</div>
</div>
</div>
<div class="modal fade" id="modalPasswdUser" tabindex="-1" role="dialog" aria-labelledby="modalPasswdUser" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
</button>
<h4 class="modal-title" id="myModalLabel">
<i class="fa fa-plus fa-1x"> </i> <i class="fa fa-key"> </i> Change user password
</h4>
</div>
<!-- Modal Body -->
<div class="modal-body">
<form id="modalPasswdUserForm" class="form-inline form-label-left">
<div class="x_content" style="padding: 0px;">
<div class="row">
<div class="col-md-12 col-xs-12">
<input id="id" hidden/>
<label class="control-label" for="password">Password <span class="required">*</span>
</label>
<input id="password" class="roundbox" name="password" placeholder="Password" data-parsley-trigger="change" required type="text" style="width:100%">
</div>
</div>
</div>
</form>
<!-- Modal Footer -->
<div class="modal-footer">
<ul class="nav navbar-left panel_toolbox">
<li><button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button></li>
</ul>
<ul class="nav navbar-right panel_toolbox">
<li><button id="send" type="button" class="btn btn-success">Change user password</button></li>
</ul>
</div>
</div>
</div>
</div>
</div>

View File

@ -61,10 +61,11 @@
</table>
</div>
</div>
{% include 'pages/modals/users_modals.html' %}
{% include 'pages/users_detail.html' %}
</div>
</div>
{% include 'pages/modals/users_modals.html' %}
{% endblock %}

View File

@ -1,113 +1,15 @@
<div style="display:none">
<div class="row template-detail-domain">
<div class="col-md-1 col-sm-1 col-xs-12">
<div class="row template-detail-users">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="row">
<div class="col-md-12 col-md-12 col-xs-12" id="actions-d.id" data-pk="d.id" data-name="d.name">
{% if(current_user.role!='user') %}
<div class="col-md-12 col-md-12 col-xs-12" id="actions-d.id" data-pk="d.id" data-username="d.username">
<div class="row">
<button class="btn btn-success btn-xs pull-right btn-jumperurl" type="button" data-placement="top" ><i class="fa fa-eye m-right-xs"></i>Viewer</button>
</div>
<div class="row">
<button class="btn btn-success btn-xs pull-right btn-template" type="button" data-placement="top" ><i class="fa fa-cube m-right-xs"></i>Template it</button>
</div>
<div class="row">
<button class="btn btn-success btn-xs pull-right btn-forcedhyp" type="button" data-placement="top" ><i class="fa fa-rocket m-right-xs"></i>Forced hyp</button>
</div>
<!-- Needed for admin -->
<div class="row">
<button class="btn btn-danger btn-xs pull-right btn-delete-template" type="button" data-placement="top" ><i class="fa fa-remove m-right-xs"></i>Delete</button>
</div>
{% endif %}
<div class="row">
<button class="btn btn-info btn-xs pull-right btn-edit" type="button" data-placement="top" ><i class="fa fa-pencil m-right-xs"></i>Edit</button>
</div>
<div class="row">
<button class="btn btn-danger btn-xs pull-right btn-delete" type="button" data-placement="top" ><i class="fa fa-remove m-right-xs"></i>Delete</button>
</div>
{% if(current_user.role=='admin') %}
<hr>
<div class="row">
<button class="btn btn-info btn-xs pull-right btn-xml" type="button" data-placement="top" ><i class="fa fa-file-code-o m-right-xs"></i>XML</button>
</div>
<div class="row">
<button class="btn btn-info btn-xs pull-right btn-events" type="button" data-placement="top" ><i class="fa fa-file-code-o m-right-xs"></i>Logs</button>
</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-11 col-sm-11 col-xs-12">
<div class="x_panel" style="background-color: #F7F7F7">
<div class="row">
<div class="col-md-12 col-md-12 col-xs-12">
<div class="x_panel">
<div class="x_content">
<h3>Status detailed info: <small id="status-detail-d.id"></small></h3>
</div>
</div>
</div>
</div>
<div class="row" >
<div class="col-md-4 col-md-4 col-xs-12">
<div id="hardware-d.id" class="x_content">
{% include '/snippets/domain_hardware.html' %}
</div>
</div>
<div class="col-md-8 col-md-8 col-xs-12">
{% if(current_user.role=='admin') %}
<div class="row">
<div class="col-md-12 col-md-12 col-xs-12">
<div class="x_content">
<div class="x_panel">
<div class="x_title">
<h3>Template tree<small></small></h3>
<div class="clearfix"></div>
</div>
<div class="x_content">
{% include '/snippets/template_tree.html' %}
<button class="btn btn-info btn-xs btn-passwd" type="button" data-placement="top" ><i class="fa fa-key m-right-xs"></i>Reset password</button>
<button class="btn btn-info btn-xs btn-edit" type="button" data-placement="top" ><i class="fa fa-pencil m-right-xs"></i>Edit</button>
<button class="btn btn-danger btn-xs btn-delete" type="button" data-placement="top" ><i class="fa fa-remove m-right-xs"></i>Delete</button>
</div>
</div>
</div>
</div>
</div>
{% endif %}
<div class="row" >
<div class="col-md-12 col-md-12 col-xs-12">
<div id="hotplug-d.id" class="x_content">
{% include '/snippets/domain_hotplugged.html' %}
</div>
</div>
<!--
<div class="col-md-12 col-md-12 col-xs-12">
<div id="events-d.id" class="x_content">
include '/snippets/domain_genealogy.html'
</div>
</div>
-->
<!--
<div class="col-md-12 col-md-12 col-xs-12">
<div id="graphs-d.id" class="x_content">
include '/snippets/domain_graphs.html'
</div>
</div>
-->
</div>
</div>
</div>
<div class="row" >
<!--
<div class="col-md-12 col-md-12 col-xs-12">
<div id="derivates-d.id" class="x_content">
{% if(current_user.role=='admin') %}
include '/snippets/domain_derivates.html'
{% endif %}
</div>
</div>
-->
</div>
</div>
</div>
</div>
</div>