@@ -15,14 +15,14 @@ |
||
| 15 | 15 | Schema::create('notifications', function (Blueprint $table) { |
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name',100); |
| 18 | - $table->text('description')->nullable(); |
|
| 18 | + $table->text('description')->nullable(); |
|
| 19 | 19 | $table->string('item_name',100); |
| 20 | 20 | $table->string('item_type',100); |
| 21 | 21 | $table->integer('item_id'); |
| 22 | 22 | $table->boolean('notified'); |
| 23 | 23 | $table->softDeletes(); |
| 24 | 24 | $table->timestamps(); |
| 25 | - }); |
|
| 25 | + }); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -12,12 +12,12 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('notifications', function (Blueprint $table) { |
|
| 15 | + Schema::create('notifications', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100); |
|
| 17 | + $table->string('name', 100); |
|
| 18 | 18 | $table->text('description')->nullable(); |
| 19 | - $table->string('item_name',100); |
|
| 20 | - $table->string('item_type',100); |
|
| 19 | + $table->string('item_name', 100); |
|
| 20 | + $table->string('item_type', 100); |
|
| 21 | 21 | $table->integer('item_id'); |
| 22 | 22 | $table->boolean('notified'); |
| 23 | 23 | $table->softDeletes(); |
@@ -12,77 +12,77 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Delete previous permissions. |
|
| 17 | - */ |
|
| 15 | + /** |
|
| 16 | + * Delete previous permissions. |
|
| 17 | + */ |
|
| 18 | 18 | DB::table('permissions')->whereIn('model', ['notifications'])->delete(); |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * Insert the permissions related to this module. |
|
| 22 | - */ |
|
| 23 | - DB::table('permissions')->insert( |
|
| 24 | - [ |
|
| 25 | - /** |
|
| 26 | - * Logs model permissions. |
|
| 27 | - */ |
|
| 28 | - [ |
|
| 29 | - 'name' => 'find', |
|
| 30 | - 'model' => 'notifications', |
|
| 31 | - 'created_at' => \DB::raw('NOW()'), |
|
| 32 | - 'updated_at' => \DB::raw('NOW()') |
|
| 33 | - ], |
|
| 34 | - [ |
|
| 35 | - 'name' => 'search', |
|
| 36 | - 'model' => 'notifications', |
|
| 37 | - 'created_at' => \DB::raw('NOW()'), |
|
| 38 | - 'updated_at' => \DB::raw('NOW()') |
|
| 39 | - ], |
|
| 40 | - [ |
|
| 41 | - 'name' => 'list', |
|
| 42 | - 'model' => 'notifications', |
|
| 43 | - 'created_at' => \DB::raw('NOW()'), |
|
| 44 | - 'updated_at' => \DB::raw('NOW()') |
|
| 45 | - ], |
|
| 46 | - [ |
|
| 47 | - 'name' => 'findby', |
|
| 48 | - 'model' => 'notifications', |
|
| 49 | - 'created_at' => \DB::raw('NOW()'), |
|
| 50 | - 'updated_at' => \DB::raw('NOW()') |
|
| 51 | - ], |
|
| 52 | - [ |
|
| 53 | - 'name' => 'first', |
|
| 54 | - 'model' => 'notifications', |
|
| 55 | - 'created_at' => \DB::raw('NOW()'), |
|
| 56 | - 'updated_at' => \DB::raw('NOW()') |
|
| 57 | - ], |
|
| 58 | - [ |
|
| 59 | - 'name' => 'paginate', |
|
| 60 | - 'model' => 'notifications', |
|
| 61 | - 'created_at' => \DB::raw('NOW()'), |
|
| 62 | - 'updated_at' => \DB::raw('NOW()') |
|
| 63 | - ], |
|
| 64 | - [ |
|
| 65 | - 'name' => 'paginateby', |
|
| 66 | - 'model' => 'notifications', |
|
| 67 | - 'created_at' => \DB::raw('NOW()'), |
|
| 68 | - 'updated_at' => \DB::raw('NOW()') |
|
| 69 | - ], |
|
| 70 | - [ |
|
| 71 | - 'name' => 'notified', |
|
| 72 | - 'model' => 'notifications', |
|
| 73 | - 'created_at' => \DB::raw('NOW()'), |
|
| 74 | - 'updated_at' => \DB::raw('NOW()') |
|
| 75 | - ], |
|
| 76 | - [ |
|
| 77 | - 'name' => 'notifyall', |
|
| 78 | - 'model' => 'notifications', |
|
| 79 | - 'created_at' => \DB::raw('NOW()'), |
|
| 80 | - 'updated_at' => \DB::raw('NOW()') |
|
| 81 | - ], |
|
| 82 | - ] |
|
| 83 | - ); |
|
| 21 | + * Insert the permissions related to this module. |
|
| 22 | + */ |
|
| 23 | + DB::table('permissions')->insert( |
|
| 24 | + [ |
|
| 25 | + /** |
|
| 26 | + * Logs model permissions. |
|
| 27 | + */ |
|
| 28 | + [ |
|
| 29 | + 'name' => 'find', |
|
| 30 | + 'model' => 'notifications', |
|
| 31 | + 'created_at' => \DB::raw('NOW()'), |
|
| 32 | + 'updated_at' => \DB::raw('NOW()') |
|
| 33 | + ], |
|
| 34 | + [ |
|
| 35 | + 'name' => 'search', |
|
| 36 | + 'model' => 'notifications', |
|
| 37 | + 'created_at' => \DB::raw('NOW()'), |
|
| 38 | + 'updated_at' => \DB::raw('NOW()') |
|
| 39 | + ], |
|
| 40 | + [ |
|
| 41 | + 'name' => 'list', |
|
| 42 | + 'model' => 'notifications', |
|
| 43 | + 'created_at' => \DB::raw('NOW()'), |
|
| 44 | + 'updated_at' => \DB::raw('NOW()') |
|
| 45 | + ], |
|
| 46 | + [ |
|
| 47 | + 'name' => 'findby', |
|
| 48 | + 'model' => 'notifications', |
|
| 49 | + 'created_at' => \DB::raw('NOW()'), |
|
| 50 | + 'updated_at' => \DB::raw('NOW()') |
|
| 51 | + ], |
|
| 52 | + [ |
|
| 53 | + 'name' => 'first', |
|
| 54 | + 'model' => 'notifications', |
|
| 55 | + 'created_at' => \DB::raw('NOW()'), |
|
| 56 | + 'updated_at' => \DB::raw('NOW()') |
|
| 57 | + ], |
|
| 58 | + [ |
|
| 59 | + 'name' => 'paginate', |
|
| 60 | + 'model' => 'notifications', |
|
| 61 | + 'created_at' => \DB::raw('NOW()'), |
|
| 62 | + 'updated_at' => \DB::raw('NOW()') |
|
| 63 | + ], |
|
| 64 | + [ |
|
| 65 | + 'name' => 'paginateby', |
|
| 66 | + 'model' => 'notifications', |
|
| 67 | + 'created_at' => \DB::raw('NOW()'), |
|
| 68 | + 'updated_at' => \DB::raw('NOW()') |
|
| 69 | + ], |
|
| 70 | + [ |
|
| 71 | + 'name' => 'notified', |
|
| 72 | + 'model' => 'notifications', |
|
| 73 | + 'created_at' => \DB::raw('NOW()'), |
|
| 74 | + 'updated_at' => \DB::raw('NOW()') |
|
| 75 | + ], |
|
| 76 | + [ |
|
| 77 | + 'name' => 'notifyall', |
|
| 78 | + 'model' => 'notifications', |
|
| 79 | + 'created_at' => \DB::raw('NOW()'), |
|
| 80 | + 'updated_at' => \DB::raw('NOW()') |
|
| 81 | + ], |
|
| 82 | + ] |
|
| 83 | + ); |
|
| 84 | 84 | |
| 85 | - /** |
|
| 85 | + /** |
|
| 86 | 86 | * Assign the permissions to the admin group. |
| 87 | 87 | */ |
| 88 | 88 | $permissionIds = DB::table('permissions')->whereIn('model', ['notifications'])->select('id')->lists('id'); |
@@ -5,51 +5,51 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class NotificationObserver { |
| 7 | 7 | |
| 8 | - public function saving($model) |
|
| 9 | - { |
|
| 10 | - // |
|
| 11 | - } |
|
| 12 | - |
|
| 13 | - public function saved($model) |
|
| 14 | - { |
|
| 15 | - // |
|
| 16 | - } |
|
| 17 | - |
|
| 18 | - public function creating($model) |
|
| 19 | - { |
|
| 20 | - // |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - /** |
|
| 24 | - * Publish the created notification to the redis server |
|
| 25 | - * to broadcast it to all listners. |
|
| 26 | - * |
|
| 27 | - * @param object $model the model beign created. |
|
| 28 | - * @return void |
|
| 29 | - */ |
|
| 30 | - public function created($model) |
|
| 31 | - { |
|
| 32 | - \Redis::publish('notification', json_encode($model->toArray())); |
|
| 33 | - } |
|
| 34 | - |
|
| 35 | - public function updating($model) |
|
| 36 | - { |
|
| 37 | - // |
|
| 38 | - } |
|
| 39 | - |
|
| 40 | - public function updated($model) |
|
| 41 | - { |
|
| 42 | - // |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - public function deleting($model) |
|
| 46 | - { |
|
| 47 | - // |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - public function deleted($model) |
|
| 51 | - { |
|
| 52 | - // |
|
| 53 | - } |
|
| 8 | + public function saving($model) |
|
| 9 | + { |
|
| 10 | + // |
|
| 11 | + } |
|
| 12 | + |
|
| 13 | + public function saved($model) |
|
| 14 | + { |
|
| 15 | + // |
|
| 16 | + } |
|
| 17 | + |
|
| 18 | + public function creating($model) |
|
| 19 | + { |
|
| 20 | + // |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + /** |
|
| 24 | + * Publish the created notification to the redis server |
|
| 25 | + * to broadcast it to all listners. |
|
| 26 | + * |
|
| 27 | + * @param object $model the model beign created. |
|
| 28 | + * @return void |
|
| 29 | + */ |
|
| 30 | + public function created($model) |
|
| 31 | + { |
|
| 32 | + \Redis::publish('notification', json_encode($model->toArray())); |
|
| 33 | + } |
|
| 34 | + |
|
| 35 | + public function updating($model) |
|
| 36 | + { |
|
| 37 | + // |
|
| 38 | + } |
|
| 39 | + |
|
| 40 | + public function updated($model) |
|
| 41 | + { |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + public function deleting($model) |
|
| 46 | + { |
|
| 47 | + // |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + public function deleted($model) |
|
| 51 | + { |
|
| 52 | + // |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | 55 | } |
| 56 | 56 | \ No newline at end of file |
@@ -5,36 +5,36 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Notification extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'notifications'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'notifications'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
| 14 | 14 | |
| 15 | - public function getCreatedAtAttribute($value) |
|
| 16 | - { |
|
| 17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | - } |
|
| 15 | + public function getCreatedAtAttribute($value) |
|
| 16 | + { |
|
| 17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - public function getUpdatedAtAttribute($value) |
|
| 21 | - { |
|
| 22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | - } |
|
| 20 | + public function getUpdatedAtAttribute($value) |
|
| 21 | + { |
|
| 22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - public function getDeletedAtAttribute($value) |
|
| 26 | - { |
|
| 27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | - } |
|
| 25 | + public function getDeletedAtAttribute($value) |
|
| 26 | + { |
|
| 27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - public function item() |
|
| 31 | - { |
|
| 32 | - return $this->morphTo(); |
|
| 33 | - } |
|
| 30 | + public function item() |
|
| 31 | + { |
|
| 32 | + return $this->morphTo(); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - public static function boot() |
|
| 36 | - { |
|
| 37 | - parent::boot(); |
|
| 38 | - parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver')); |
|
| 39 | - } |
|
| 35 | + public static function boot() |
|
| 36 | + { |
|
| 37 | + parent::boot(); |
|
| 38 | + parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver')); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class Notification extends Model{ |
|
| 6 | +class Notification extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'notifications'; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | * to preform actions like (add, edit ... etc). |
| 13 | 13 | * @var string |
| 14 | 14 | */ |
| 15 | - protected $model = 'notifications'; |
|
| 15 | + protected $model = 'notifications'; |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Set the notification notified to true. |
@@ -8,30 +8,30 @@ |
||
| 8 | 8 | class NotificationsController extends BaseApiController |
| 9 | 9 | { |
| 10 | 10 | /** |
| 11 | - * The name of the model that is used by the base api controller |
|
| 12 | - * to preform actions like (add, edit ... etc). |
|
| 13 | - * @var string |
|
| 14 | - */ |
|
| 15 | - protected $model = 'notifications'; |
|
| 11 | + * The name of the model that is used by the base api controller |
|
| 12 | + * to preform actions like (add, edit ... etc). |
|
| 13 | + * @var string |
|
| 14 | + */ |
|
| 15 | + protected $model = 'notifications'; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Set the notification notified to true. |
|
| 19 | - * |
|
| 20 | - * @param integer $id |
|
| 21 | - * @return \Illuminate\Http\Response |
|
| 22 | - */ |
|
| 23 | - public function notified($id) |
|
| 24 | - { |
|
| 25 | - return \Response::json(\Core::notifications()->notified($id), 200); |
|
| 26 | - } |
|
| 17 | + /** |
|
| 18 | + * Set the notification notified to true. |
|
| 19 | + * |
|
| 20 | + * @param integer $id |
|
| 21 | + * @return \Illuminate\Http\Response |
|
| 22 | + */ |
|
| 23 | + public function notified($id) |
|
| 24 | + { |
|
| 25 | + return \Response::json(\Core::notifications()->notified($id), 200); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Set the notification notified to all. |
|
| 30 | - * |
|
| 31 | - * @return \Illuminate\Http\Response |
|
| 32 | - */ |
|
| 33 | - public function notifyall() |
|
| 34 | - { |
|
| 35 | - return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Set the notification notified to all. |
|
| 30 | + * |
|
| 31 | + * @return \Illuminate\Http\Response |
|
| 32 | + */ |
|
| 33 | + public function notifyall() |
|
| 34 | + { |
|
| 35 | + return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -5,41 +5,41 @@ |
||
| 5 | 5 | |
| 6 | 6 | class AclGroup extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'groups'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name']; |
|
| 14 | - |
|
| 15 | - public function getCreatedAtAttribute($value) |
|
| 16 | - { |
|
| 17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | - } |
|
| 19 | - |
|
| 20 | - public function getUpdatedAtAttribute($value) |
|
| 21 | - { |
|
| 22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - public function getDeletedAtAttribute($value) |
|
| 26 | - { |
|
| 27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - public function users() |
|
| 31 | - { |
|
| 32 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | - } |
|
| 34 | - |
|
| 35 | - public function permissions() |
|
| 36 | - { |
|
| 37 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | - } |
|
| 39 | - |
|
| 40 | - public static function boot() |
|
| 41 | - { |
|
| 42 | - parent::boot(); |
|
| 43 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver')); |
|
| 44 | - } |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'groups'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name']; |
|
| 14 | + |
|
| 15 | + public function getCreatedAtAttribute($value) |
|
| 16 | + { |
|
| 17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | + } |
|
| 19 | + |
|
| 20 | + public function getUpdatedAtAttribute($value) |
|
| 21 | + { |
|
| 22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + public function getDeletedAtAttribute($value) |
|
| 26 | + { |
|
| 27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + public function users() |
|
| 31 | + { |
|
| 32 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | + } |
|
| 34 | + |
|
| 35 | + public function permissions() |
|
| 36 | + { |
|
| 37 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | + } |
|
| 39 | + |
|
| 40 | + public static function boot() |
|
| 41 | + { |
|
| 42 | + parent::boot(); |
|
| 43 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver')); |
|
| 44 | + } |
|
| 45 | 45 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class AclGroup extends Model{ |
|
| 6 | +class AclGroup extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'groups'; |
@@ -29,12 +29,12 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function users() |
| 31 | 31 | { |
| 32 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 32 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function permissions() |
| 36 | 36 | { |
| 37 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 37 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public static function boot() |
@@ -13,19 +13,19 @@ |
||
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | 15 | Schema::create('groups', function (Blueprint $table) { |
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100)->unique(); |
|
| 18 | - $table->softDeletes(); |
|
| 19 | - $table->timestamps(); |
|
| 20 | - }); |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100)->unique(); |
|
| 18 | + $table->softDeletes(); |
|
| 19 | + $table->timestamps(); |
|
| 20 | + }); |
|
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | - $table->increments('id'); |
|
| 24 | - $table->integer('user_id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->softDeletes(); |
|
| 27 | - $table->timestamps(); |
|
| 28 | - }); |
|
| 22 | + Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | + $table->increments('id'); |
|
| 24 | + $table->integer('user_id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->softDeletes(); |
|
| 27 | + $table->timestamps(); |
|
| 28 | + }); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('groups', function (Blueprint $table) { |
|
| 15 | + Schema::create('groups', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100)->unique(); |
|
| 17 | + $table->string('name', 100)->unique(); |
|
| 18 | 18 | $table->softDeletes(); |
| 19 | 19 | $table->timestamps(); |
| 20 | 20 | }); |
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 22 | + Schema::create('users_groups', function(Blueprint $table) { |
|
| 23 | 23 | $table->increments('id'); |
| 24 | 24 | $table->integer('user_id'); |
| 25 | 25 | $table->integer('group_id'); |
@@ -12,191 +12,191 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Delete previous permissions. |
|
| 17 | - */ |
|
| 15 | + /** |
|
| 16 | + * Delete previous permissions. |
|
| 17 | + */ |
|
| 18 | 18 | DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete(); |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * Insert the permissions related to this module. |
|
| 22 | - */ |
|
| 23 | - DB::table('permissions')->insert( |
|
| 24 | - [ |
|
| 25 | - /** |
|
| 26 | - * Users model permissions. |
|
| 27 | - */ |
|
| 28 | - [ |
|
| 29 | - 'name' => 'save', |
|
| 30 | - 'model' => 'users', |
|
| 31 | - 'created_at' => \DB::raw('NOW()'), |
|
| 32 | - 'updated_at' => \DB::raw('NOW()') |
|
| 33 | - ], |
|
| 34 | - [ |
|
| 35 | - 'name' => 'delete', |
|
| 36 | - 'model' => 'users', |
|
| 37 | - 'created_at' => \DB::raw('NOW()'), |
|
| 38 | - 'updated_at' => \DB::raw('NOW()') |
|
| 39 | - ], |
|
| 40 | - [ |
|
| 41 | - 'name' => 'find', |
|
| 42 | - 'model' => 'users', |
|
| 43 | - 'created_at' => \DB::raw('NOW()'), |
|
| 44 | - 'updated_at' => \DB::raw('NOW()') |
|
| 45 | - ], |
|
| 46 | - [ |
|
| 47 | - 'name' => 'list', |
|
| 48 | - 'model' => 'users', |
|
| 49 | - 'created_at' => \DB::raw('NOW()'), |
|
| 50 | - 'updated_at' => \DB::raw('NOW()') |
|
| 51 | - ], |
|
| 52 | - [ |
|
| 53 | - 'name' => 'search', |
|
| 54 | - 'model' => 'users', |
|
| 55 | - 'created_at' => \DB::raw('NOW()'), |
|
| 56 | - 'updated_at' => \DB::raw('NOW()') |
|
| 57 | - ], |
|
| 58 | - [ |
|
| 59 | - 'name' => 'findby', |
|
| 60 | - 'model' => 'users', |
|
| 61 | - 'created_at' => \DB::raw('NOW()'), |
|
| 62 | - 'updated_at' => \DB::raw('NOW()') |
|
| 63 | - ], |
|
| 64 | - [ |
|
| 65 | - 'name' => 'first', |
|
| 66 | - 'model' => 'users', |
|
| 67 | - 'created_at' => \DB::raw('NOW()'), |
|
| 68 | - 'updated_at' => \DB::raw('NOW()') |
|
| 69 | - ], |
|
| 70 | - [ |
|
| 71 | - 'name' => 'paginate', |
|
| 72 | - 'model' => 'users', |
|
| 73 | - 'created_at' => \DB::raw('NOW()'), |
|
| 74 | - 'updated_at' => \DB::raw('NOW()') |
|
| 75 | - ], |
|
| 76 | - [ |
|
| 77 | - 'name' => 'paginateby', |
|
| 78 | - 'model' => 'users', |
|
| 79 | - 'created_at' => \DB::raw('NOW()'), |
|
| 80 | - 'updated_at' => \DB::raw('NOW()') |
|
| 81 | - ], |
|
| 82 | - [ |
|
| 83 | - 'name' => 'assigngroups', |
|
| 84 | - 'model' => 'users', |
|
| 85 | - 'created_at' => \DB::raw('NOW()'), |
|
| 86 | - 'updated_at' => \DB::raw('NOW()') |
|
| 87 | - ], |
|
| 21 | + * Insert the permissions related to this module. |
|
| 22 | + */ |
|
| 23 | + DB::table('permissions')->insert( |
|
| 24 | + [ |
|
| 25 | + /** |
|
| 26 | + * Users model permissions. |
|
| 27 | + */ |
|
| 28 | + [ |
|
| 29 | + 'name' => 'save', |
|
| 30 | + 'model' => 'users', |
|
| 31 | + 'created_at' => \DB::raw('NOW()'), |
|
| 32 | + 'updated_at' => \DB::raw('NOW()') |
|
| 33 | + ], |
|
| 34 | + [ |
|
| 35 | + 'name' => 'delete', |
|
| 36 | + 'model' => 'users', |
|
| 37 | + 'created_at' => \DB::raw('NOW()'), |
|
| 38 | + 'updated_at' => \DB::raw('NOW()') |
|
| 39 | + ], |
|
| 40 | + [ |
|
| 41 | + 'name' => 'find', |
|
| 42 | + 'model' => 'users', |
|
| 43 | + 'created_at' => \DB::raw('NOW()'), |
|
| 44 | + 'updated_at' => \DB::raw('NOW()') |
|
| 45 | + ], |
|
| 46 | + [ |
|
| 47 | + 'name' => 'list', |
|
| 48 | + 'model' => 'users', |
|
| 49 | + 'created_at' => \DB::raw('NOW()'), |
|
| 50 | + 'updated_at' => \DB::raw('NOW()') |
|
| 51 | + ], |
|
| 52 | + [ |
|
| 53 | + 'name' => 'search', |
|
| 54 | + 'model' => 'users', |
|
| 55 | + 'created_at' => \DB::raw('NOW()'), |
|
| 56 | + 'updated_at' => \DB::raw('NOW()') |
|
| 57 | + ], |
|
| 58 | + [ |
|
| 59 | + 'name' => 'findby', |
|
| 60 | + 'model' => 'users', |
|
| 61 | + 'created_at' => \DB::raw('NOW()'), |
|
| 62 | + 'updated_at' => \DB::raw('NOW()') |
|
| 63 | + ], |
|
| 64 | + [ |
|
| 65 | + 'name' => 'first', |
|
| 66 | + 'model' => 'users', |
|
| 67 | + 'created_at' => \DB::raw('NOW()'), |
|
| 68 | + 'updated_at' => \DB::raw('NOW()') |
|
| 69 | + ], |
|
| 70 | + [ |
|
| 71 | + 'name' => 'paginate', |
|
| 72 | + 'model' => 'users', |
|
| 73 | + 'created_at' => \DB::raw('NOW()'), |
|
| 74 | + 'updated_at' => \DB::raw('NOW()') |
|
| 75 | + ], |
|
| 76 | + [ |
|
| 77 | + 'name' => 'paginateby', |
|
| 78 | + 'model' => 'users', |
|
| 79 | + 'created_at' => \DB::raw('NOW()'), |
|
| 80 | + 'updated_at' => \DB::raw('NOW()') |
|
| 81 | + ], |
|
| 82 | + [ |
|
| 83 | + 'name' => 'assigngroups', |
|
| 84 | + 'model' => 'users', |
|
| 85 | + 'created_at' => \DB::raw('NOW()'), |
|
| 86 | + 'updated_at' => \DB::raw('NOW()') |
|
| 87 | + ], |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * Permissions model permissions. |
|
| 91 | - */ |
|
| 92 | - [ |
|
| 93 | - 'name' => 'find', |
|
| 94 | - 'model' => 'permissions', |
|
| 95 | - 'created_at' => \DB::raw('NOW()'), |
|
| 96 | - 'updated_at' => \DB::raw('NOW()') |
|
| 97 | - ], |
|
| 98 | - [ |
|
| 99 | - 'name' => 'search', |
|
| 100 | - 'model' => 'permissions', |
|
| 101 | - 'created_at' => \DB::raw('NOW()'), |
|
| 102 | - 'updated_at' => \DB::raw('NOW()') |
|
| 103 | - ], |
|
| 104 | - [ |
|
| 105 | - 'name' => 'list', |
|
| 106 | - 'model' => 'permissions', |
|
| 107 | - 'created_at' => \DB::raw('NOW()'), |
|
| 108 | - 'updated_at' => \DB::raw('NOW()') |
|
| 109 | - ], |
|
| 110 | - [ |
|
| 111 | - 'name' => 'findby', |
|
| 112 | - 'model' => 'permissions', |
|
| 113 | - 'created_at' => \DB::raw('NOW()'), |
|
| 114 | - 'updated_at' => \DB::raw('NOW()') |
|
| 115 | - ], |
|
| 116 | - [ |
|
| 117 | - 'name' => 'first', |
|
| 118 | - 'model' => 'permissions', |
|
| 119 | - 'created_at' => \DB::raw('NOW()'), |
|
| 120 | - 'updated_at' => \DB::raw('NOW()') |
|
| 121 | - ], |
|
| 122 | - [ |
|
| 123 | - 'name' => 'paginate', |
|
| 124 | - 'model' => 'permissions', |
|
| 125 | - 'created_at' => \DB::raw('NOW()'), |
|
| 126 | - 'updated_at' => \DB::raw('NOW()') |
|
| 127 | - ], |
|
| 128 | - [ |
|
| 129 | - 'name' => 'paginateby', |
|
| 130 | - 'model' => 'permissions', |
|
| 131 | - 'created_at' => \DB::raw('NOW()'), |
|
| 132 | - 'updated_at' => \DB::raw('NOW()') |
|
| 133 | - ], |
|
| 89 | + /** |
|
| 90 | + * Permissions model permissions. |
|
| 91 | + */ |
|
| 92 | + [ |
|
| 93 | + 'name' => 'find', |
|
| 94 | + 'model' => 'permissions', |
|
| 95 | + 'created_at' => \DB::raw('NOW()'), |
|
| 96 | + 'updated_at' => \DB::raw('NOW()') |
|
| 97 | + ], |
|
| 98 | + [ |
|
| 99 | + 'name' => 'search', |
|
| 100 | + 'model' => 'permissions', |
|
| 101 | + 'created_at' => \DB::raw('NOW()'), |
|
| 102 | + 'updated_at' => \DB::raw('NOW()') |
|
| 103 | + ], |
|
| 104 | + [ |
|
| 105 | + 'name' => 'list', |
|
| 106 | + 'model' => 'permissions', |
|
| 107 | + 'created_at' => \DB::raw('NOW()'), |
|
| 108 | + 'updated_at' => \DB::raw('NOW()') |
|
| 109 | + ], |
|
| 110 | + [ |
|
| 111 | + 'name' => 'findby', |
|
| 112 | + 'model' => 'permissions', |
|
| 113 | + 'created_at' => \DB::raw('NOW()'), |
|
| 114 | + 'updated_at' => \DB::raw('NOW()') |
|
| 115 | + ], |
|
| 116 | + [ |
|
| 117 | + 'name' => 'first', |
|
| 118 | + 'model' => 'permissions', |
|
| 119 | + 'created_at' => \DB::raw('NOW()'), |
|
| 120 | + 'updated_at' => \DB::raw('NOW()') |
|
| 121 | + ], |
|
| 122 | + [ |
|
| 123 | + 'name' => 'paginate', |
|
| 124 | + 'model' => 'permissions', |
|
| 125 | + 'created_at' => \DB::raw('NOW()'), |
|
| 126 | + 'updated_at' => \DB::raw('NOW()') |
|
| 127 | + ], |
|
| 128 | + [ |
|
| 129 | + 'name' => 'paginateby', |
|
| 130 | + 'model' => 'permissions', |
|
| 131 | + 'created_at' => \DB::raw('NOW()'), |
|
| 132 | + 'updated_at' => \DB::raw('NOW()') |
|
| 133 | + ], |
|
| 134 | 134 | |
| 135 | - /** |
|
| 136 | - * Groups model permissions. |
|
| 137 | - */ |
|
| 138 | - [ |
|
| 139 | - 'name' => 'save', |
|
| 140 | - 'model' => 'groups', |
|
| 141 | - 'created_at' => \DB::raw('NOW()'), |
|
| 142 | - 'updated_at' => \DB::raw('NOW()') |
|
| 143 | - ], |
|
| 144 | - [ |
|
| 145 | - 'name' => 'delete', |
|
| 146 | - 'model' => 'groups', |
|
| 147 | - 'created_at' => \DB::raw('NOW()'), |
|
| 148 | - 'updated_at' => \DB::raw('NOW()') |
|
| 149 | - ], |
|
| 150 | - [ |
|
| 151 | - 'name' => 'find', |
|
| 152 | - 'model' => 'groups', |
|
| 153 | - 'created_at' => \DB::raw('NOW()'), |
|
| 154 | - 'updated_at' => \DB::raw('NOW()') |
|
| 155 | - ], |
|
| 156 | - [ |
|
| 157 | - 'name' => 'search', |
|
| 158 | - 'model' => 'groups', |
|
| 159 | - 'created_at' => \DB::raw('NOW()'), |
|
| 160 | - 'updated_at' => \DB::raw('NOW()') |
|
| 161 | - ], |
|
| 162 | - [ |
|
| 163 | - 'name' => 'list', |
|
| 164 | - 'model' => 'groups', |
|
| 165 | - 'created_at' => \DB::raw('NOW()'), |
|
| 166 | - 'updated_at' => \DB::raw('NOW()') |
|
| 167 | - ], |
|
| 168 | - [ |
|
| 169 | - 'name' => 'findby', |
|
| 170 | - 'model' => 'groups', |
|
| 171 | - 'created_at' => \DB::raw('NOW()'), |
|
| 172 | - 'updated_at' => \DB::raw('NOW()') |
|
| 173 | - ], |
|
| 174 | - [ |
|
| 175 | - 'name' => 'first', |
|
| 176 | - 'model' => 'groups', |
|
| 177 | - 'created_at' => \DB::raw('NOW()'), |
|
| 178 | - 'updated_at' => \DB::raw('NOW()') |
|
| 179 | - ], |
|
| 180 | - [ |
|
| 181 | - 'name' => 'paginate', |
|
| 182 | - 'model' => 'groups', |
|
| 183 | - 'created_at' => \DB::raw('NOW()'), |
|
| 184 | - 'updated_at' => \DB::raw('NOW()') |
|
| 185 | - ], |
|
| 186 | - [ |
|
| 187 | - 'name' => 'paginateby', |
|
| 188 | - 'model' => 'groups', |
|
| 189 | - 'created_at' => \DB::raw('NOW()'), |
|
| 190 | - 'updated_at' => \DB::raw('NOW()') |
|
| 191 | - ], |
|
| 192 | - [ |
|
| 193 | - 'name' => 'assignpermissions', |
|
| 194 | - 'model' => 'groups', |
|
| 195 | - 'created_at' => \DB::raw('NOW()'), |
|
| 196 | - 'updated_at' => \DB::raw('NOW()') |
|
| 197 | - ], |
|
| 198 | - ] |
|
| 199 | - ); |
|
| 135 | + /** |
|
| 136 | + * Groups model permissions. |
|
| 137 | + */ |
|
| 138 | + [ |
|
| 139 | + 'name' => 'save', |
|
| 140 | + 'model' => 'groups', |
|
| 141 | + 'created_at' => \DB::raw('NOW()'), |
|
| 142 | + 'updated_at' => \DB::raw('NOW()') |
|
| 143 | + ], |
|
| 144 | + [ |
|
| 145 | + 'name' => 'delete', |
|
| 146 | + 'model' => 'groups', |
|
| 147 | + 'created_at' => \DB::raw('NOW()'), |
|
| 148 | + 'updated_at' => \DB::raw('NOW()') |
|
| 149 | + ], |
|
| 150 | + [ |
|
| 151 | + 'name' => 'find', |
|
| 152 | + 'model' => 'groups', |
|
| 153 | + 'created_at' => \DB::raw('NOW()'), |
|
| 154 | + 'updated_at' => \DB::raw('NOW()') |
|
| 155 | + ], |
|
| 156 | + [ |
|
| 157 | + 'name' => 'search', |
|
| 158 | + 'model' => 'groups', |
|
| 159 | + 'created_at' => \DB::raw('NOW()'), |
|
| 160 | + 'updated_at' => \DB::raw('NOW()') |
|
| 161 | + ], |
|
| 162 | + [ |
|
| 163 | + 'name' => 'list', |
|
| 164 | + 'model' => 'groups', |
|
| 165 | + 'created_at' => \DB::raw('NOW()'), |
|
| 166 | + 'updated_at' => \DB::raw('NOW()') |
|
| 167 | + ], |
|
| 168 | + [ |
|
| 169 | + 'name' => 'findby', |
|
| 170 | + 'model' => 'groups', |
|
| 171 | + 'created_at' => \DB::raw('NOW()'), |
|
| 172 | + 'updated_at' => \DB::raw('NOW()') |
|
| 173 | + ], |
|
| 174 | + [ |
|
| 175 | + 'name' => 'first', |
|
| 176 | + 'model' => 'groups', |
|
| 177 | + 'created_at' => \DB::raw('NOW()'), |
|
| 178 | + 'updated_at' => \DB::raw('NOW()') |
|
| 179 | + ], |
|
| 180 | + [ |
|
| 181 | + 'name' => 'paginate', |
|
| 182 | + 'model' => 'groups', |
|
| 183 | + 'created_at' => \DB::raw('NOW()'), |
|
| 184 | + 'updated_at' => \DB::raw('NOW()') |
|
| 185 | + ], |
|
| 186 | + [ |
|
| 187 | + 'name' => 'paginateby', |
|
| 188 | + 'model' => 'groups', |
|
| 189 | + 'created_at' => \DB::raw('NOW()'), |
|
| 190 | + 'updated_at' => \DB::raw('NOW()') |
|
| 191 | + ], |
|
| 192 | + [ |
|
| 193 | + 'name' => 'assignpermissions', |
|
| 194 | + 'model' => 'groups', |
|
| 195 | + 'created_at' => \DB::raw('NOW()'), |
|
| 196 | + 'updated_at' => \DB::raw('NOW()') |
|
| 197 | + ], |
|
| 198 | + ] |
|
| 199 | + ); |
|
| 200 | 200 | |
| 201 | 201 | /** |
| 202 | 202 | * Delete previous data. |
@@ -224,29 +224,29 @@ discard block |
||
| 224 | 224 | * Create Default users. |
| 225 | 225 | */ |
| 226 | 226 | $adminUserId = DB::table('users')->insertGetId( |
| 227 | - [ |
|
| 227 | + [ |
|
| 228 | 228 | 'email' => '[email protected]', |
| 229 | 229 | 'password' => bcrypt('123456'), |
| 230 | 230 | 'created_at' => \DB::raw('NOW()'), |
| 231 | 231 | 'updated_at' => \DB::raw('NOW()') |
| 232 | 232 | ] |
| 233 | - ); |
|
| 233 | + ); |
|
| 234 | 234 | |
| 235 | 235 | /** |
| 236 | 236 | * Assign users to groups. |
| 237 | 237 | */ |
| 238 | 238 | DB::table('users_groups')->insert( |
| 239 | - [ |
|
| 240 | - [ |
|
| 239 | + [ |
|
| 240 | + [ |
|
| 241 | 241 | 'user_id' => $adminUserId, |
| 242 | 242 | 'group_id' => $adminGroupId, |
| 243 | 243 | 'created_at' => \DB::raw('NOW()'), |
| 244 | 244 | 'updated_at' => \DB::raw('NOW()') |
| 245 | - ] |
|
| 246 | - ] |
|
| 247 | - ); |
|
| 245 | + ] |
|
| 246 | + ] |
|
| 247 | + ); |
|
| 248 | 248 | |
| 249 | - /** |
|
| 249 | + /** |
|
| 250 | 250 | * Assign the permissions to the admin group. |
| 251 | 251 | */ |
| 252 | 252 | $permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id'); |
@@ -12,21 +12,21 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 19 | - $table->softDeletes(); |
|
| 20 | - $table->timestamps(); |
|
| 21 | - $table->unique(array('name', 'model')); |
|
| 22 | - }); |
|
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | - $table->increments('id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->integer('permission_id'); |
|
| 27 | - $table->softDeletes(); |
|
| 28 | - $table->timestamps(); |
|
| 29 | - }); |
|
| 15 | + Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100); |
|
| 18 | + $table->string('model',100); |
|
| 19 | + $table->softDeletes(); |
|
| 20 | + $table->timestamps(); |
|
| 21 | + $table->unique(array('name', 'model')); |
|
| 22 | + }); |
|
| 23 | + Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | + $table->increments('id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->integer('permission_id'); |
|
| 27 | + $table->softDeletes(); |
|
| 28 | + $table->timestamps(); |
|
| 29 | + }); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -12,15 +12,15 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 15 | + Schema::create('permissions', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 17 | + $table->string('name', 100); |
|
| 18 | + $table->string('model', 100); |
|
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | 21 | $table->unique(array('name', 'model')); |
| 22 | 22 | }); |
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 23 | + Schema::create('groups_permissions', function(Blueprint $table) { |
|
| 24 | 24 | $table->increments('id'); |
| 25 | 25 | $table->integer('group_id'); |
| 26 | 26 | $table->integer('permission_id'); |