Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed issue #197: HTML web interface calls /_admin/user-manager/session

This commit is contained in:
Frank Celler 2012-09-13 13:42:53 +02:00
parent 5075e1f764
commit 55824fa836
2 changed files with 77 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,7 +1,9 @@
not released yet
----------------
* issue #195: VERSION file in database directory
* fixed issue #197: HTML web interface calls /_admin/user-manager/session
* fixed issue #195: VERSION file in database directory
* fixed issue #193: REST API HEAD request returns a message body on 404

148
html/admin/js/master.js
View File

@ -177,21 +177,21 @@ $("#tabs").tabs({
/// checks for a login user cookie, creates new sessions if null
///////////////////////////////////////////////////////////////////////////////
if ($.cookie("sid") == null) {
$('#logoutButton').hide();
$('#movetologinButton').show();
$.ajax({
type: "POST",
url: "/_admin/user-manager/session/",
contentType: "application/json",
processData: false,
success: function(data) {
$.cookie("sid", data.sid);
},
error: function(data) {
}
});
}
// if ($.cookie("sid") == null) {
// $('#logoutButton').hide();
// $('#movetologinButton').show();
// $.ajax({
// type: "POST",
// url: "/_admin/user-manager/session/",
// contentType: "application/json",
// processData: false,
// success: function(data) {
// $.cookie("sid", data.sid);
// },
// error: function(data) {
// }
// });
// }
///////////////////////////////////////////////////////////////////////////////
/// if user exists, then:
@ -1072,74 +1072,74 @@ var logTable = $('#logTableID').dataTable({
/// perform logout
///////////////////////////////////////////////////////////////////////////////
$('#logoutButton').live('click', function () {
$.ajax({
type: "PUT",
url: '/_admin/user-manager/session/' + sid + '/logout',
data: JSON.stringify({'user': currentUser}),
contentType: "application/json",
processData: false,
success: function(data) {
$('#loginWindow').show();
$('#logoutButton').hide();
$('#movetologinButton').show();
$('#activeUser').text('Guest!');
$.cookie("rights", null);
$.cookie("user", null);
currentUser = null;
window.location.href = "";
},
error: function(data) {
}
});
});
// $('#logoutButton').live('click', function () {
// $.ajax({
// type: "PUT",
// url: '/_admin/user-manager/session/' + sid + '/logout',
// data: JSON.stringify({'user': currentUser}),
// contentType: "application/json",
// processData: false,
// success: function(data) {
// $('#loginWindow').show();
// $('#logoutButton').hide();
// $('#movetologinButton').show();
// $('#activeUser').text('Guest!');
// $.cookie("rights", null);
// $.cookie("user", null);
// currentUser = null;
// window.location.href = "";
// },
// error: function(data) {
// }
// });
// });
///////////////////////////////////////////////////////////////////////////////
/// perform login
///////////////////////////////////////////////////////////////////////////////
$('#loginButton').live('click', function () {
var username = $('#usernameField').val();
var password = $('#passwordField').val();
var shapassword;
// $('#loginButton').live('click', function () {
// var username = $('#usernameField').val();
// var password = $('#passwordField').val();
// var shapassword;
if (password != '') {
shapassword = $.sha256(password);
}
else {
shapassword = password;
}
// if (password != '') {
// shapassword = $.sha256(password);
// }
// else {
// shapassword = password;
// }
$.ajax({
type: "PUT",
url: '/_admin/user-manager/session/' + sid + '/login',
data: JSON.stringify({'user': username, 'password': shapassword}),
contentType: "application/json",
processData: false,
success: function(data) {
currentUser = $.cookie("user");
$('#loginWindow').hide();
$('#logoutButton').show();
$('#movetologinButton').hide();
$('#activeUser').text(username + '!');
$.cookie("rights", data.rights);
$.cookie("user", data.user);
// $.ajax({
// type: "PUT",
// url: '/_admin/user-manager/session/' + sid + '/login',
// data: JSON.stringify({'user': username, 'password': shapassword}),
// contentType: "application/json",
// processData: false,
// success: function(data) {
// currentUser = $.cookie("user");
// $('#loginWindow').hide();
// $('#logoutButton').show();
// $('#movetologinButton').hide();
// $('#activeUser').text(username + '!');
// $.cookie("rights", data.rights);
// $.cookie("user", data.user);
/*animation*/
$('#movetologinButton').text("Login");
$('#footerSlideContent').animate({ height: '25px' });
$('#footerSlideButton').css('backgroundPosition', 'top left');
open = false;
// /*animation*/
// $('#movetologinButton').text("Login");
// $('#footerSlideContent').animate({ height: '25px' });
// $('#footerSlideButton').css('backgroundPosition', 'top left');
// open = false;
return false;
},
error: function(data) {
alert(JSON.stringify(data));
return false;
}
});
return false;
});
// return false;
// },
// error: function(data) {
// alert(JSON.stringify(data));
// return false;
// }
// });
// return false;
// });
///////////////////////////////////////////////////////////////////////////////
/// toggle button for source / table - new document view