mirror of
https://github.com/nextcloud/server.git
synced 2024-08-12 14:11:31 +02:00
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
This commit is contained in:
parent
99cb37a6d1
commit
7312cbec91
@ -4,6 +4,8 @@
|
|||||||
OCP\JSON::callCheck();
|
OCP\JSON::callCheck();
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
|
|
||||||
|
$l=OC_L10N::get('core');
|
||||||
|
|
||||||
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
|
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
|
||||||
$displayName = $_POST["displayName"];
|
$displayName = $_POST["displayName"];
|
||||||
|
|
||||||
@ -26,7 +28,7 @@ if(is_null($userstatus)) {
|
|||||||
|
|
||||||
// Return Success story
|
// Return Success story
|
||||||
if( OC_User::setDisplayName( $username, $displayName )) {
|
if( OC_User::setDisplayName( $username, $displayName )) {
|
||||||
OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
|
OC_JSON::success(array("data" => array( "message" => $l->t('Your display name was changed'), "username" => $username, 'displayName' => $displayName )));
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) )));
|
OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) )));
|
||||||
|
@ -20,16 +20,40 @@ function changeEmailAddress(){
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Post the email address change to the server.
|
||||||
|
*/
|
||||||
|
function changeDisplayName(){
|
||||||
|
if ($('#displayName').val() !== '' ) {
|
||||||
|
OC.msg.startSaving('#displaynameform .msg');
|
||||||
|
// Serialize the data
|
||||||
|
var post = $( "#displaynameform" ).serialize();
|
||||||
|
// Ajax foo
|
||||||
|
$.post( 'ajax/changedisplayname.php', post, function(data){
|
||||||
|
if( data.status === "success" ){
|
||||||
|
$('#oldDisplayName').text($('#displayName').val());
|
||||||
|
// update displayName on the top right expand button
|
||||||
|
$('#expandDisplayName').text($('#displayName').val());
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#newdisplayname').val(data.data.displayName);
|
||||||
|
}
|
||||||
|
OC.msg.finishedSaving('#displaynameform .msg', data);
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$("#passwordbutton").click( function(){
|
$("#passwordbutton").click( function(){
|
||||||
if ($('#pass1').val() != '' && $('#pass2').val() != '') {
|
if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
|
||||||
// Serialize the data
|
// Serialize the data
|
||||||
var post = $( "#passwordform" ).serialize();
|
var post = $( "#passwordform" ).serialize();
|
||||||
$('#passwordchanged').hide();
|
$('#passwordchanged').hide();
|
||||||
$('#passworderror').hide();
|
$('#passworderror').hide();
|
||||||
// Ajax foo
|
// Ajax foo
|
||||||
$.post( 'ajax/changepassword.php', post, function(data){
|
$.post( 'ajax/changepassword.php', post, function(data){
|
||||||
if( data.status == "success" ){
|
if( data.status === "success" ){
|
||||||
$('#pass1').val('');
|
$('#pass1').val('');
|
||||||
$('#pass2').val('');
|
$('#pass2').val('');
|
||||||
$('#passwordchanged').show();
|
$('#passwordchanged').show();
|
||||||
@ -48,41 +72,23 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#displaynamebutton").click( function(){
|
$('#displayName').keyup(function(){
|
||||||
if ($('#displayName').val() != '' ) {
|
if ($('#displayName').val() !== '' ){
|
||||||
// Serialize the data
|
if(typeof timeout !== 'undefined'){
|
||||||
var post = $( "#displaynameform" ).serialize();
|
clearTimeout(timeout);
|
||||||
$('#displaynamechanged').hide();
|
}
|
||||||
$('#displaynemerror').hide();
|
timeout = setTimeout('changeDisplayName()',1000);
|
||||||
// Ajax foo
|
}
|
||||||
$.post( 'ajax/changedisplayname.php', post, function(data){
|
});
|
||||||
if( data.status == "success" ){
|
|
||||||
$('#displaynamechanged').show();
|
|
||||||
$('#oldDisplayName').text($('#displayName').val());
|
|
||||||
// update displayName on the top right expand button
|
|
||||||
$('#expandDisplayName').text($('#displayName').val());
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
$('#newdisplayname').val(data.data.displayName)
|
|
||||||
$('#displaynameerror').html( data.data.message );
|
|
||||||
$('#displaynameerror').show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
$('#displayName').val($('#oldDisplayName').val());
|
|
||||||
$('#displaynamechanged').hide();
|
|
||||||
$('#displaynameerror').show();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#email').keyup(function(){
|
$('#email').keyup(function(){
|
||||||
if(typeof timeout !== 'undefined'){
|
if ($('#email').val() !== '' ){
|
||||||
clearTimeout(timeout);
|
if(typeof timeout !== 'undefined'){
|
||||||
|
clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
timeout = setTimeout('changeEmailAddress()',1000);
|
||||||
}
|
}
|
||||||
timeout = setTimeout('changeEmailAddress()',1000);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#languageinput").chosen();
|
$("#languageinput").chosen();
|
||||||
@ -92,7 +98,7 @@ $(document).ready(function(){
|
|||||||
var post = $( "#languageinput" ).serialize();
|
var post = $( "#languageinput" ).serialize();
|
||||||
// Ajax foo
|
// Ajax foo
|
||||||
$.post( 'ajax/setlanguage.php', post, function(data){
|
$.post( 'ajax/setlanguage.php', post, function(data){
|
||||||
if( data.status == "success" ){
|
if( data.status === "success" ){
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@ -113,12 +119,12 @@ OC.msg={
|
|||||||
.show();
|
.show();
|
||||||
},
|
},
|
||||||
finishedSaving:function(selector, data){
|
finishedSaving:function(selector, data){
|
||||||
if( data.status == "success" ){
|
if( data.status === "success" ){
|
||||||
$(selector).html( data.data.message )
|
$(selector).html( data.data.message )
|
||||||
.addClass('success')
|
.addClass('success')
|
||||||
.stop(true, true)
|
.stop(true, true)
|
||||||
.delay(3000)
|
.delay(3000)
|
||||||
.fadeOut(600);
|
.fadeOut(900);
|
||||||
}else{
|
}else{
|
||||||
$(selector).html( data.data.message ).addClass('error');
|
$(selector).html( data.data.message ).addClass('error');
|
||||||
}
|
}
|
||||||
|
@ -54,11 +54,9 @@ if($_['displayNameChangeSupported']) {
|
|||||||
<form id="displaynameform">
|
<form id="displaynameform">
|
||||||
<fieldset class="personalblock">
|
<fieldset class="personalblock">
|
||||||
<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
|
<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
|
||||||
<div id="displaynamechanged"><?php p($l->t('Your display name was changed'));?></div>
|
|
||||||
<div id="displaynameerror"><?php p($l->t('Unable to change your display name'));?></div>
|
|
||||||
<input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" />
|
<input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" />
|
||||||
|
<span class="msg"></span>
|
||||||
<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
|
<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
|
||||||
<input id="displaynamebutton" type="submit" value="<?php p($l->t('Change display name'));?>" />
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
<?php
|
<?php
|
||||||
|
Loading…
Reference in New Issue
Block a user