mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1408 from pixelfed/frontend-ui-refactor 

Fixes #1407
This commit is contained in:
daniel 2019-06-16 18:02:43 -06:00 committed by GitHub
parent d4be2389cd aa192d342d
commit fc66feaf6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Settings/HomeSettings.php
View File

@ -147,9 +147,10 @@ trait HomeSettings
$log->save(); $log->save();
return redirect('/settings/home')->with('status', 'Password successfully updated!'); return redirect('/settings/home')->with('status', 'Password successfully updated!');
} else {
return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
} }
return redirect('/settings/home')->with('error', 'There was an error with your request!');
} }
public function email() public function email()

5
resources/views/settings/template.blade.php
View File

@ -13,6 +13,11 @@
@endforeach @endforeach
</div> </div>
@endif @endif
@if (session('error'))
<div class="alert alert-danger px-3 h6 text-center">
{{ session('error') }}
</div>
@endif
<div class="container"> <div class="container">
<div class="col-12"> <div class="col-12">