DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12753 from snipe/fixes/lang_for_group_not_found

Browse source 
Fixes/lang for group not found
This commit is contained in:
snipe 2023-03-28 16:45:22 -07:00 committed by GitHub
parent b57b5e23d9 32922e6461
commit c9d1274edc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/GroupsController.php
View file

@ -92,7 +92,7 @@ class GroupsController extends Controller
return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions')); return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
} }
return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found')); return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
} }
/** /**
@ -107,7 +107,7 @@ class GroupsController extends Controller
public function update(Request $request, $id = null) public function update(Request $request, $id = null)
{ {
if (! $group = Group::find($id)) { if (! $group = Group::find($id)) {
return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
} }
$group->name = $request->input('name'); $group->name = $request->input('name');
$group->permissions = json_encode($request->input('permission')); $group->permissions = json_encode($request->input('permission'));
@ -133,14 +133,13 @@ class GroupsController extends Controller
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @throws \Exception * @throws \Exception
*/ */
public function destroy($id = null) public function destroy($id)
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
if (! $group = Group::find($id)) { if (! $group = Group::find($id)) {
return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
} }
$group->delete(); $group->delete();
// Redirect to the group management page
return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete')); return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete'));
} }
@ -164,6 +163,6 @@ class GroupsController extends Controller
return view('groups/view', compact('group')); return view('groups/view', compact('group'));
} }
return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
} }
} }

2
resources/lang/en/admin/groups/message.php
View file

@ -3,7 +3,7 @@
return array( return array(
'group_exists' => 'Group already exists!', 'group_exists' => 'Group already exists!',
'group_not_found' => 'Group [:id] does not exist.', 'group_not_found' => 'Group ID :id does not exist.',
'group_name_required' => 'The name field is required', 'group_name_required' => 'The name field is required',
'success' => array( 'success' => array(

2
resources/views/groups/index.blade.php
View file

@ -43,7 +43,7 @@
<tr> <tr>
<th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th> <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th> <th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
<th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true">{{ trans('admin/groups/table.users') }}</th> <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><i class="fas fa-user" aria-hidden="true"></i><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
<th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th> <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th> <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>
</tr> </tr>