ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2062 - old permissions masks to new

Browse Source
This commit is contained in:
snipe
2016-05-20 12:23:31 -07:00
parent f6cdd90e41
commit 7fd6051514
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GroupsController.php
+6 -6
View File
@@ -47,11 +47,11 @@ class GroupsController extends Controller
$group = new Group;
// Get all the available permissions
$permissions = config('permissions');
$selectedPermissions = Input::old('permissions', array());
$groupPermissions = array();
$selectedPermissions = Input::old('permissions', $groupPermissions);
// Show the page
return View::make('groups/edit', compact('permissions', 'selectedPermissions'))->with('group', $group);
return View::make('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
}
/**
@@ -91,9 +91,9 @@ class GroupsController extends Controller
{
$group = Group::find($id);
$permissions = config('permissions');
$group->permissions = $group->decodePermissions();
$selected_array = Helper::selectedPermissionsArray($permissions, $group->permissions);
return View::make('groups/edit', compact('group', 'permissions','selected_array'));
$groupPermissions = $group->decodePermissions();
$selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
return View::make('groups/edit', compact('group', 'permissions','selected_array','groupPermissions'));
}
/**