mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-20 15:57:41 -07:00
Use corrected language string
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
527c812d04
commit
32922e6461
|
@ -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]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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(
|
||||||
|
|
Loading…
Reference in a new issue