wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dont use the old .status way

Browse source
This commit is contained in:
Joas Schilling 2015-04-20 18:15:06 +02:00
parent 3f96662609
commit 04674c06cc
3 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/encryption/controller/settingscontroller.php
View file

@ -118,23 +118,14 @@ class SettingsController extends Controller {
if ($result === true) {
$this->session->setStatus(Session::INIT_SUCCESSFUL);
return new DataResponse(
['data' => [
'status' => 'success',
'message' => (string) $this->l->t('Private key password successfully updated.'),
],
]
['message' => (string) $this->l->t('Private key password successfully updated.')]
);
} else {
return new DataResponse(
['data' => [
'message' => (string) $errorMessage,
],
],
['message' => (string) $errorMessage],
Http::STATUS_BAD_REQUEST
);
}
}
}

17
apps/encryption/js/settings-personal.js
View file

@ -9,16 +9,13 @@ function updatePrivateKeyPasswd() {
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
OC.msg.startSaving('#encryption .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword')
, { oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword }
, function( data ) {
if (data.status === "error") {
OC.msg.finishedSaving('#encryption .msg', data);
} else {
OC.msg.finishedSaving('#encryption .msg', data);
}
}
);
OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword'),
{ oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword }
).success(function(response) {
OC.msg.finishedSuccess('#encryption .msg', response.message);
}).fail(function(response) {
OC.msg.finishedError('#encryption .msg', response.responseJSON.message);
});
}
$(document).ready(function(){

6
apps/encryption/tests/controller/SettingsControllerTest.php
View file

@ -131,7 +131,7 @@ class SettingsControllerTest extends TestCase {
$this->assertSame(Http::STATUS_BAD_REQUEST, $result->getStatus());
$this->assertSame('The current log-in password was not correct, please try again.',
$data['data']['message']);
$data['message']);
}
/**
@ -158,7 +158,7 @@ class SettingsControllerTest extends TestCase {
$this->assertSame(Http::STATUS_BAD_REQUEST, $result->getStatus());
$this->assertSame('The old password was not correct, please try again.',
$data['data']['message']);
$data['message']);
}
/**
@ -216,7 +216,7 @@ class SettingsControllerTest extends TestCase {
$this->assertSame(Http::STATUS_OK, $result->getStatus());
$this->assertSame('Private key password successfully updated.',
$data['data']['message']);
$data['message']);
}
}