@@ -2,13 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Afrittella\BackProject\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Afrittella\BackProject\Facades\MediaManager; |
|
| 6 | 5 | use Afrittella\BackProject\Repositories\Attachments; |
| 7 | 6 | use Afrittella\BackProject\Repositories\Criteria\Attachments\All; |
| 8 | -use Afrittella\BackProject\Repositories\Criteria\Attachments\ByUser; |
|
| 9 | 7 | use Illuminate\Http\Request; |
| 10 | 8 | use Illuminate\Support\Facades\Auth; |
| 11 | -use Illuminate\Support\Facades\Storage; |
|
| 12 | 9 | use Prologue\Alerts\Facades\Alert; |
| 13 | 10 | |
| 14 | 11 | class MediaController extends Controller |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Afrittella\BackProject\Http\Requests\PermissionEdit; |
| 7 | 7 | use Afrittella\BackProject\Repositories\Permissions; |
| 8 | 8 | use Afrittella\BackProject\Repositories\Roles; |
| 9 | -use Illuminate\Http\Request; |
|
| 10 | 9 | use Prologue\Alerts\Facades\Alert; |
| 11 | 10 | |
| 12 | 11 | class PermissionsController extends Controller |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Afrittella\BackProject\Http\Requests\RoleEdit; |
| 7 | 7 | use Afrittella\BackProject\Repositories\Permissions; |
| 8 | 8 | use Afrittella\BackProject\Repositories\Roles; |
| 9 | -use Illuminate\Http\Request; |
|
| 10 | 9 | use Prologue\Alerts\Facades\Alert; |
| 11 | 10 | |
| 12 | 11 | class RolesController extends Controller |
@@ -3,13 +3,11 @@ |
||
| 3 | 3 | namespace Afrittella\BackProject\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Afrittella\BackProject\Http\Requests\AccountStore; |
| 6 | -use Afrittella\BackProject\Http\Requests\AccountEdit; |
|
| 7 | 6 | use Afrittella\BackProject\Repositories\Users; |
| 8 | 7 | use Afrittella\BackProject\Repositories\Roles; |
| 9 | 8 | use Afrittella\BackProject\Http\Requests\UserAdd; |
| 10 | 9 | use Afrittella\BackProject\Http\Requests\UserEdit; |
| 11 | 10 | use Afrittella\BackProject\Events\UserRegistered as Registered; |
| 12 | -use Illuminate\Http\Request; |
|
| 13 | 11 | use Prologue\Alerts\Facades\Alert; |
| 14 | 12 | use Auth; |
| 15 | 13 | |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Afrittella\BackProject\Repositories; |
| 3 | 3 | |
| 4 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
| 5 | - |
|
| 6 | 4 | class Menus extends Base |
| 7 | 5 | { |
| 8 | 6 | function model() |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Afrittella\BackProject\Repositories; |
| 3 | 3 | |
| 4 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
| 5 | - |
|
| 6 | 4 | class Permissions extends Base |
| 7 | 5 | { |
| 8 | 6 | public function model() |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Afrittella\BackProject\Repositories; |
| 3 | 3 | |
| 4 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
| 5 | - |
|
| 6 | 4 | class Roles extends Base |
| 7 | 5 | { |
| 8 | 6 | public function model() |
@@ -2,9 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Afrittella\BackProject\Repositories; |
| 4 | 4 | |
| 5 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
| 6 | 5 | use Afrittella\BackProject\Models\SocialAccount; |
| 7 | -use Kalnoy\Nestedset\QueryBuilder; |
|
| 8 | 6 | use Laravel\Socialite\Contracts\User as SocialProvider; |
| 9 | 7 | |
| 10 | 8 | class Users extends Base |
@@ -107,8 +107,9 @@ discard block |
||
| 107 | 107 | $model = $this->app->make($this->model()); |
| 108 | 108 | //$model = app()->make($this->model()); |
| 109 | 109 | |
| 110 | - if (!$model instanceof Model) |
|
| 111 | - throw new RepositoryException("Class {$this->model()} must be an instance of Illuminate\\Database\\Eloquent\\Model"); |
|
| 110 | + if (!$model instanceof Model) { |
|
| 111 | + throw new RepositoryException("Class {$this->model()} must be an instance of Illuminate\\Database\\Eloquent\\Model"); |
|
| 112 | + } |
|
| 112 | 113 | |
| 113 | 114 | return $this->model = $model; |
| 114 | 115 | } |
@@ -143,12 +144,14 @@ discard block |
||
| 143 | 144 | } |
| 144 | 145 | |
| 145 | 146 | public function applyCriteria() { |
| 146 | - if($this->skipCriteria === true) |
|
| 147 | - return $this; |
|
| 147 | + if($this->skipCriteria === true) { |
|
| 148 | + return $this; |
|
| 149 | + } |
|
| 148 | 150 | |
| 149 | 151 | foreach($this->getCriteria() as $criteria) { |
| 150 | - if($criteria instanceof Criteria) |
|
| 151 | - $this->model = $criteria->apply($this->model, $this); |
|
| 152 | + if($criteria instanceof Criteria) { |
|
| 153 | + $this->model = $criteria->apply($this->model, $this); |
|
| 154 | + } |
|
| 152 | 155 | } |
| 153 | 156 | |
| 154 | 157 | return $this; |