@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Yajra\CMS\DataTables\UsersDataTable; |
|
| 6 | 5 | use App\User; |
| 7 | 6 | use Illuminate\Database\QueryException; |
| 8 | 7 | use Illuminate\Http\Request; |
| 9 | 8 | use Yajra\Acl\Models\Role; |
| 9 | +use Yajra\CMS\DataTables\UsersDataTable; |
|
| 10 | 10 | |
| 11 | 11 | class UsersController extends Controller |
| 12 | 12 | { |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\Http\Requests; |
|
| 6 | 5 | use Collective\Html\HtmlBuilder; |
| 7 | 6 | use Illuminate\Contracts\Console\Kernel; |
| 8 | 7 | use Illuminate\Contracts\Logging\Log; |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | /** |
| 56 | 56 | * Generate the menu. |
| 57 | 57 | * |
| 58 | - * @param \Caffeinated\Menus\Builder|\Caffeinated\Menus\Item $parentMenu |
|
| 58 | + * @param Builder $parentMenu |
|
| 59 | 59 | * @param \Yajra\CMS\Entities\Menu $item |
| 60 | 60 | */ |
| 61 | 61 | protected function generateMenu($parentMenu, $item) |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | /** |
| 10 | 10 | * Edit link of the article. |
| 11 | 11 | * |
| 12 | - * @return string |
|
| 12 | + * @return \Illuminate\Support\HtmlString |
|
| 13 | 13 | */ |
| 14 | 14 | public function editLink() |
| 15 | 15 | { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | /** |
| 30 | 30 | * Publication state. |
| 31 | 31 | * |
| 32 | - * @return string |
|
| 32 | + * @return \Illuminate\Support\HtmlString |
|
| 33 | 33 | */ |
| 34 | 34 | public function published() |
| 35 | 35 | { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * Store a newly created navigation. |
| 53 | 53 | * |
| 54 | 54 | * @param \Illuminate\Http\Request $request |
| 55 | - * @return mixed |
|
| 55 | + * @return \Illuminate\Http\RedirectResponse |
|
| 56 | 56 | */ |
| 57 | 57 | public function store(Request $request) |
| 58 | 58 | { |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * |
| 87 | 87 | * @param \Yajra\CMS\Entities\Navigation $navigation |
| 88 | 88 | * @param \Illuminate\Http\Request $request |
| 89 | - * @return mixed |
|
| 89 | + * @return \Illuminate\Http\RedirectResponse |
|
| 90 | 90 | */ |
| 91 | 91 | public function update(Navigation $navigation, Request $request) |
| 92 | 92 | { |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * Remove selected navigation. |
| 108 | 108 | * |
| 109 | 109 | * @param \Yajra\CMS\Entities\Navigation $navigation |
| 110 | - * @return string |
|
| 110 | + * @return \Illuminate\Http\JsonResponse |
|
| 111 | 111 | * @throws \Exception |
| 112 | 112 | */ |
| 113 | 113 | public function destroy(Navigation $navigation) |
@@ -155,7 +155,7 @@ |
||
| 155 | 155 | * Get all widget types. |
| 156 | 156 | * |
| 157 | 157 | * @param string $type |
| 158 | - * @return string |
|
| 158 | + * @return \Illuminate\Http\JsonResponse |
|
| 159 | 159 | */ |
| 160 | 160 | public function templates($type) |
| 161 | 161 | { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | /** |
| 59 | 59 | * Get all extensions. |
| 60 | 60 | * |
| 61 | - * @return \Illuminate\Database\Eloquent\Collection|static[] |
|
| 61 | + * @return \Illuminate\Database\Eloquent\Collection |
|
| 62 | 62 | */ |
| 63 | 63 | public function all() |
| 64 | 64 | { |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\Http\Requests; |
|
| 6 | 5 | use Collective\Html\HtmlBuilder; |
| 7 | 6 | use Illuminate\Contracts\Console\Kernel; |
| 8 | 7 | use Illuminate\Contracts\Logging\Log; |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | /** |
| 59 | 59 | * Get all extensions. |
| 60 | 60 | * |
| 61 | - * @return \Illuminate\Database\Eloquent\Collection|static[] |
|
| 61 | + * @return \Illuminate\Database\Eloquent\Collection |
|
| 62 | 62 | */ |
| 63 | 63 | public function all() |
| 64 | 64 | { |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Repositories\FileAsset; |
| 4 | 4 | |
| 5 | +use Roumen\Asset\Asset; |
|
| 5 | 6 | use Yajra\CMS\Entities\Configuration; |
| 6 | 7 | use Yajra\CMS\Entities\FileAsset; |
| 7 | 8 | use Yajra\CMS\Entities\FileAssetGroup; |
| 8 | 9 | use Yajra\CMS\Repositories\RepositoryAbstract; |
| 9 | -use Roumen\Asset\Asset; |
|
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * Class FileAssetEloquentRepository |