Browse Source

fix routes

pull/105/head^2 1.4.4
KodeStar 7 years ago
parent
commit
1f38de989b
  1. 22
      app/Http/Controllers/ItemController.php
  2. 16
      app/Http/Controllers/SettingsController.php
  3. 12
      app/Http/Controllers/TagController.php

22
app/Http/Controllers/ItemController.php

@ -49,7 +49,8 @@ class ItemController extends Controller
$item = Item::findOrFail($id); $item = Item::findOrFail($id);
$item->pinned = true; $item->pinned = true;
$item->save(); $item->save();
return redirect()->route('dash', [], false); $route = route('dash', [], false);
return redirect($route);
} }
/** /**
@ -62,7 +63,8 @@ class ItemController extends Controller
$item = Item::findOrFail($id); $item = Item::findOrFail($id);
$item->pinned = false; $item->pinned = false;
$item->save(); $item->save();
return redirect()->route('dash', [], false); $route = route('dash', [], false);
return redirect($route);
} }
/** /**
@ -81,7 +83,8 @@ class ItemController extends Controller
$data['ajax'] = true; $data['ajax'] = true;
return view('sortable', $data); return view('sortable', $data);
} else { } else {
return redirect()->route('dash', [], false); $route = route('dash', [], false);
return redirect($route);
} }
} }
@ -151,7 +154,8 @@ class ItemController extends Controller
$item->parents()->sync($request->tags); $item->parents()->sync($request->tags);
return redirect()->route('dash', [], false) $route = route('dash', [], false);
return redirect($route)
->with('success', __('app.alert.success.item_created')); ->with('success', __('app.alert.success.item_created'));
} }
@ -214,7 +218,8 @@ class ItemController extends Controller
$item->parents()->sync($request->tags); $item->parents()->sync($request->tags);
return redirect()->route('dash', [], false) $route = route('dash', [], false);
return redirect($route)
->with('success',__('app.alert.success.item_updated')); ->with('success',__('app.alert.success.item_updated'));
} }
@ -236,7 +241,8 @@ class ItemController extends Controller
Item::find($id)->delete(); Item::find($id)->delete();
} }
return redirect()->route('items.index', [], false) $route = route('items.index', [], false);
return redirect($route)
->with('success',__('app.alert.success.item_deleted')); ->with('success',__('app.alert.success.item_deleted'));
} }
@ -252,7 +258,9 @@ class ItemController extends Controller
Item::withTrashed() Item::withTrashed()
->where('id', $id) ->where('id', $id)
->restore(); ->restore();
return redirect()->route('items.index', [], false)
$route = route('items.inded', [], false);
return redirect($route)
->with('success',__('app.alert.success.item_restored')); ->with('success',__('app.alert.success.item_restored'));
} }

16
app/Http/Controllers/SettingsController.php

@ -39,7 +39,9 @@ class SettingsController extends Controller
'setting' => $setting, 'setting' => $setting,
]); ]);
} else { } else {
return redirect()->route('settings.list', [], false)->with([ $route = route('settings.list', [], false);
return redirect($route)
->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
]); ]);
} }
@ -73,11 +75,15 @@ class SettingsController extends Controller
$setting->save(); $setting->save();
return redirect()->route('settings.index', [], false)->with([ $route = route('settings.index', [], false);
return redirect($route)
->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),
]); ]);
} else { } else {
return redirect()->route('settings.index', [], false)->with([ $route = route('settings.index', [], false);
return redirect($route)
->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
]); ]);
} }
@ -94,7 +100,9 @@ class SettingsController extends Controller
$setting->value = ''; $setting->value = '';
$setting->save(); $setting->save();
} }
return redirect()->route('settings.index', [], false)->with([ $route = route('settings.index', [], false);
return redirect($route)
->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),
]); ]);

12
app/Http/Controllers/TagController.php

@ -66,7 +66,8 @@ class TagController extends Controller
//die(print_r($request->all())); //die(print_r($request->all()));
Item::create($request->all()); Item::create($request->all());
return redirect()->route('dash', [], false) $route = route('dash', [], false);
return redirect($route)
->with('success', __('app.alert.success.tag_created')); ->with('success', __('app.alert.success.tag_created'));
} }
@ -129,7 +130,8 @@ class TagController extends Controller
Item::find($id)->update($request->all()); Item::find($id)->update($request->all());
return redirect()->route('dash', [], false) $route = route('dash', [], false);
return redirect($route)
->with('success',__('app.alert.success.tag_updated')); ->with('success',__('app.alert.success.tag_updated'));
} }
@ -151,7 +153,8 @@ class TagController extends Controller
Item::find($id)->delete(); Item::find($id)->delete();
} }
return redirect()->route('tags.index', [], false) $route = route('tags.index', [], false);
return redirect($route)
->with('success',__('app.alert.success.item_deleted')); ->with('success',__('app.alert.success.item_deleted'));
} }
@ -167,7 +170,8 @@ class TagController extends Controller
Item::withTrashed() Item::withTrashed()
->where('id', $id) ->where('id', $id)
->restore(); ->restore();
return redirect()->route('tags.index', [], false) $route = route('tags.index', [], false);
return redirect($route)
->with('success',__('app.alert.success.item_restored')); ->with('success',__('app.alert.success.item_restored'));
} }

Loading…
Cancel
Save