suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

Merge pull request #191 from nakazawakan/backend 

管理画面からプロフィールの画像の編集の修正
このコミットが含まれているのは:
chankan77 2021-12-22 11:54:12 +09:00 committed by GitHub
親 52dd6b84a9 086ce82c04
コミット 3823873bff
この署名に対応する既知のキーがデータベースに存在しません
GPGキーID: 4AEE18F83AFDEB23
3個のファイルの変更、28行の追加、24行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

12
backend/app/Http/Controllers/Api/ChildrenController.php
ファイルの表示

@ -439,11 +439,13 @@ class ChildrenController extends Controller {
$child->image = '/files/'.$filename;
$child->save();
$get = Child::where('id', (int)$child_id)->first();
$login_user_datum = $get->toArray();
unset($login_user_datum['password']);
// セッションに保存する
session()->put('children', $login_user_datum);
if (request()->route()->action['as'] == 'cic') {
$login_user_datum = $child->toArray();
unset($login_user_datum['password']);
// セッションに保存する
session()->put('children', $login_user_datum);
}
DB::commit();
} catch (\Throwable $e) {

16
backend/app/Http/Controllers/Api/FathersController.php
ファイルの表示

@ -379,11 +379,13 @@ class FathersController extends Controller {
$father->image = '/files/'.$filename;
$father->save();
$login_user_datum = $father->toArray();
unset($login_user_datum['password']);
// セッションに保存する
session()->put('fathers', $login_user_datum);
if (request()->route()->action['as'] == 'pip') {
$login_user_datum = $father->toArray();
unset($login_user_datum['password']);
// セッションに保存する
session()->put('fathers', $login_user_datum);
}
DB::commit();
} catch (\Throwable $e) {
@ -424,7 +426,7 @@ class FathersController extends Controller {
'profile' => 'max:1000',
];
if (request()->route()->action['as'] == 'fua') {
if (request()->route()->action['as'] == 'pua') {
$vali['relation_limit'] = 'required|numeric';
}
@ -434,7 +436,7 @@ class FathersController extends Controller {
return ['status_code' => 422, 'error_messages' => $validate->errors()];
}
if (request()->route()->action['as'] == 'fua') {
if (request()->route()->action['as'] == 'pua') {
$rel = FatherRelation::select('id')->where('father_id', (int)$father_id)->count();
if ($rel > (int)$r->relation_limit) {
return ['status_code' => 401, 'error_messages' => '既に設定しているリレーション以下には変更できません。'];

24
backend/routes/api.php
ファイルの表示

@ -26,9 +26,9 @@ Route::group(['prefix' => 'admin'], function () {
Route::group(['prefix' => 'fathers'], function () {
Route::get('/list', '\App\Http\Controllers\Api\FathersController@list');
Route::get('/search', '\App\Http\Controllers\Api\FathersController@search');
Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage');
Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('fua');
Route::put('/updatePassword/{father_id}', '\App\Http\Controllers\Api\FathersController@updatePassword');
Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage')->name('pia');
Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('pua');
Route::put('/updatePassword/{father_id}', '\App\Http\Controllers\Api\FathersController@updatePassword')->name('ppa');
Route::get('/detail/{father_id}', '\App\Http\Controllers\Api\FathersController@detail')->name('pda');
Route::delete('/delete/{father_id}', '\App\Http\Controllers\Api\FathersController@withdrawal');
Route::post('/registerTemporary', '\App\Http\Controllers\Api\FathersController@registerTemporary');
@ -38,9 +38,9 @@ Route::group(['prefix' => 'admin'], function () {
Route::group(['prefix' => 'children'], function () {
Route::get('/list', '\App\Http\Controllers\Api\ChildrenController@list');
Route::get('/search', '\App\Http\Controllers\Api\ChildrenController@search');
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile');
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage');
Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword');
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile')->name('cua');
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage')->name('cia');
Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword')->name('cpa');
Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail')->name('cda');
Route::delete('/delete/{child_id}', '\App\Http\Controllers\Api\ChildrenController@withdrawal');
});
@ -79,11 +79,11 @@ Route::group(['prefix' => 'fathers'], function () {
Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain');
Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword');
Route::post('/login', '\App\Http\Controllers\Api\FathersController@login');
Route::put('/updatePassword/{father_id?}', '\App\Http\Controllers\Api\FathersController@updatePassword');
Route::put('/updatePassword/{father_id?}', '\App\Http\Controllers\Api\FathersController@updatePassword')->name('ppp');
Route::group(['middleware' => ['auth:fathers', 'notice.incomplete']], function () {
Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage');
Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('fup');
Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage')->name('pip');
Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('pup');
Route::delete('/withdrawal', '\App\Http\Controllers\Api\FathersController@withdrawal');
Route::get('/detail/{father_id}', '\App\Http\Controllers\Api\FathersController@detail')->name('pdp');
Route::post('/meetingNotification', '\App\Http\Controllers\Api\FathersController@approvalNotification')->name('cmnotifynew');
@ -149,12 +149,12 @@ Route::group(['prefix' => 'children'], function () {
Route::post('/registerMain', '\App\Http\Controllers\Api\ChildrenController@registerMain');
Route::post('/requestPassword', '\App\Http\Controllers\Api\ChildrenController@requestPassword');
Route::post('/login', '\App\Http\Controllers\Api\ChildrenController@login');
Route::put('/updatePassword/{child_id?}', '\App\Http\Controllers\Api\ChildrenController@updatePassword');
Route::put('/updatePassword/{child_id?}', '\App\Http\Controllers\Api\ChildrenController@updatePassword')->name('cpc');
Route::group(['middleware' => ['auth:children', 'notice.nonapproval']], function () {
Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail')->name('cdc');
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage');
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile');
Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage')->name('cuc');
Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile')->name('cpc');
Route::delete('/withdrawal', '\App\Http\Controllers\Api\ChildrenController@withdrawal');
// FathersController