Minor improvements.
このコミットが含まれているのは:
コミット
ff955971fb
|
@ -136,6 +136,10 @@ class UserController extends Controller {
|
||||||
$valid = $this->objAuth->getPermissions($request->username, $request->password);
|
$valid = $this->objAuth->getPermissions($request->username, $request->password);
|
||||||
$cols = $this->getGroupColours()->toArray();
|
$cols = $this->getGroupColours()->toArray();
|
||||||
|
|
||||||
|
if ($valid['usr_editother'] == 1) {
|
||||||
|
array_push($getting, 'users.password');
|
||||||
|
}
|
||||||
|
|
||||||
if ($valid['usr_emailshow'] == 1) {
|
if ($valid['usr_emailshow'] == 1) {
|
||||||
array_push($getting, 'users.email');
|
array_push($getting, 'users.email');
|
||||||
}
|
}
|
||||||
|
@ -373,12 +377,21 @@ class UserController extends Controller {
|
||||||
$valid = $this->objAuth->getPermissions($request->username, $request->password);
|
$valid = $this->objAuth->getPermissions($request->username, $request->password);
|
||||||
|
|
||||||
if ($valid['usr_editprofile'] == 1) {
|
if ($valid['usr_editprofile'] == 1) {
|
||||||
DB::table('users')
|
if (isset($request->newPassword)) {
|
||||||
->where('id', $request->id)
|
DB::table('users')
|
||||||
->update([
|
->where('id', $request->id)
|
||||||
'email' => $request->email,
|
->update([
|
||||||
'password' => $request->password
|
'email' => $request->email,
|
||||||
]);
|
'password' => $request->newPassword
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DB::table('users')
|
||||||
|
->where('id', $request->id)
|
||||||
|
->update([
|
||||||
|
'email' => $request->email
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
DB::table('usr_contacts')
|
DB::table('usr_contacts')
|
||||||
->where('user_id', $request->id)
|
->where('user_id', $request->id)
|
||||||
|
|
新しいイシューから参照