shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source 
Conflicts:
	app/Http/Controllers/Auth/Login.php
This commit is contained in:
cuneytsenturk
2018-12-03 13:49:31 +03:00
parent 7570918ff8 79075e3f5a
commit 2570dad2b7
853 changed files with 22158 additions and 3528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Auth/Login.php
View File

@ -49,7 +49,7 @@ class Login extends Controller
public function store()
{
// Attempt to login
if (!auth()->attempt(request(['email', 'password']))) {
if (!auth()->attempt(request(['email', 'password']), request('remember', false))) {
flash(trans('auth.failed'))->error();
return back();
@ -79,6 +79,11 @@ class Login extends Controller
return redirect($path);
}
// Check wizard
if (!setting('general.wizard', false)) {
return redirect('wizard');
}
return redirect()->intended('/');
}

32
app/Http/Controllers/Auth/Roles.php
View File

@ -29,9 +29,21 @@ class Roles extends Controller
*/
public function create()
{
$permissions = Permission::all();
$names = $permissions = [];
$allPermissions = Permission::all();
return view('auth.roles.create', compact('permissions'));
foreach ($allPermissions as $permission) {
// permission code explode - and get permission type
$n = explode('-', $permission->name);
if (!in_array($n[0], $names)) {
$names[] = $n[0];
}
$permissions[$n[0]][] = $permission;
}
return view('auth.roles.create', compact('names', 'permissions'));
}
/**
@ -66,11 +78,23 @@ class Roles extends Controller
public function edit(Role $role)
{
//$permissions = Permission::all()->sortBy('display_name');
$permissions = Permission::all();
$names = $permissions = [];
$allPermissions = Permission::all();
$rolePermissions = $role->permissions->pluck('id', 'id')->toArray();
return view('auth.roles.edit', compact('role', 'permissions', 'rolePermissions'));
foreach ($allPermissions as $permission) {
// permission code explode - and get permission type
$n = explode('-', $permission->name);
if (!in_array($n[0], $names)) {
$names[] = $n[0];
}
$permissions[$n[0]][] = $permission;
}
return view('auth.roles.edit', compact('role', 'names', 'permissions', 'rolePermissions'));
}
/**