Browse Source

roll back previous changes

pull/15/head
Cendekia Pramana Putra 7 years ago
parent
commit
a31cd378b6
  1. 4
      app/Http/Controllers/UsersController.php
  2. 2
      resources/views/users/edit.blade.php
  3. 2
      tests/Feature/UsersProfileTest.php

4
app/Http/Controllers/UsersController.php

@ -142,8 +142,8 @@ class UsersController extends Controller
$user->city = $request->get('city'); $user->city = $request->get('city');
$user->email = $request->get('email'); $user->email = $request->get('email');
if ($request->new_password) {
$user->password = bcrypt($request->new_password);
if ($request->get('password')) {
$user->password = bcrypt($request->get('password'));
} }
$user->save(); $user->save();

2
resources/views/users/edit.blade.php

@ -90,8 +90,6 @@
<div class="panel-body"> <div class="panel-body">
{!! FormField::email('email', ['label' => trans('auth.email'), 'placeholder' => trans('app.example').' nama@mail.com']) !!} {!! FormField::email('email', ['label' => trans('auth.email'), 'placeholder' => trans('app.example').' nama@mail.com']) !!}
{!! FormField::password('password', ['label' => trans('auth.old_password'), 'placeholder' => '******', 'value' => '']) !!} {!! FormField::password('password', ['label' => trans('auth.old_password'), 'placeholder' => '******', 'value' => '']) !!}
{!! FormField::password('new_password', ['label' => trans('auth.new_password'), 'placeholder' => '******', 'value' => '']) !!}
{!! FormField::password ('new_password_confirmation', ['label' => trans('auth.new_password_confirmation'), 'placeholder' => '******', 'value' => '']) !!}
</div> </div>
</div> </div>
<div class="text-right"> <div class="text-right">

2
tests/Feature/UsersProfileTest.php

@ -66,8 +66,6 @@ class UsersProfileTest extends TestCase
$this->submitForm(trans('app.update'), [ $this->submitForm(trans('app.update'), [
'email' => 'user@mail.com', 'email' => 'user@mail.com',
'password' => 'Secr3t', 'password' => 'Secr3t',
'new_password' => 'Secr3t2',
'new_password_confirmation' => 'Secr3t2',
]); ]);
$user = $user->fresh(); $user = $user->fresh();

Loading…
Cancel
Save