diff options
Diffstat (limited to 'main/app/sprinkles/admin/src/Sprunje')
7 files changed, 34 insertions, 47 deletions
diff --git a/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php b/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php index da4f0e3..3af04f0 100644 --- a/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -37,8 +38,7 @@ class ActivitySprunje extends Sprunje /** * Set the initial query used by your Sprunje. */ - protected function baseQuery() - { + protected function baseQuery() { $query = $this->classMapper->createInstance('activity'); return $query->joinUser(); @@ -51,8 +51,7 @@ class ActivitySprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterUser($query, $value) - { + protected function filterUser($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { @@ -72,8 +71,7 @@ class ActivitySprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortUser($query, $direction) - { + protected function sortUser($query, $direction) { $query->orderBy('users.last_name', $direction); return $this; } diff --git a/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php b/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php index 7c75691..849673b 100644 --- a/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -35,8 +36,7 @@ class GroupSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('group')->newQuery(); } } diff --git a/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php b/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php index c1803f1..0a38ee9 100644 --- a/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -40,8 +41,7 @@ class PermissionSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('permission')->newQuery(); } @@ -52,8 +52,7 @@ class PermissionSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterInfo($query, $value) - { + protected function filterInfo($query, $value) { return $this->filterProperties($query, $value); } @@ -64,15 +63,14 @@ class PermissionSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterProperties($query, $value) - { + protected function filterProperties($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('slug', $value) - ->orLike('conditions', $value) - ->orLike('description', $value); + ->orLike('conditions', $value) + ->orLike('description', $value); } }); return $this; @@ -85,8 +83,7 @@ class PermissionSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortProperties($query, $direction) - { + protected function sortProperties($query, $direction) { $query->orderBy('slug', $direction); return $this; } diff --git a/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php b/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php index 242681d..3c7b4ea 100644 --- a/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -26,8 +27,7 @@ class PermissionUserSprunje extends UserSprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { // Requires a permission id if (!isset($this->options['permission_id'])) { throw new BadRequestException(); diff --git a/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php b/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php index c5e0f8b..624a1ba 100644 --- a/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -40,8 +41,7 @@ class RoleSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('role')->newQuery(); } @@ -52,14 +52,13 @@ class RoleSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterInfo($query, $value) - { + protected function filterInfo($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('name', $value) - ->orLike('description', $value); + ->orLike('description', $value); } }); return $this; diff --git a/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php b/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php index 6142e74..f3c1734 100644 --- a/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -26,8 +27,7 @@ class UserPermissionSprunje extends PermissionSprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { // Requires a user id if (!isset($this->options['user_id'])) { throw new BadRequestException(); diff --git a/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php b/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php index 12378f9..0837912 100644 --- a/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -46,8 +47,7 @@ class UserSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { $query = $this->classMapper->createInstance('user'); // Join user's most recent activity @@ -61,8 +61,7 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterLastActivity($query, $value) - { + protected function filterLastActivity($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { @@ -80,15 +79,14 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterName($query, $value) - { + protected function filterName($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('first_name', $value) - ->orLike('last_name', $value) - ->orLike('email', $value); + ->orLike('last_name', $value) + ->orLike('email', $value); } }); return $this; @@ -101,17 +99,16 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterStatus($query, $value) - { + protected function filterStatus($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { if ($value == 'disabled') { $query->orWhere('flag_enabled', 0); - } elseif ($value == 'unactivated') { + } else if ($value == 'unactivated') { $query->orWhere('flag_verified', 0); - } elseif ($value == 'active') { + } else if ($value == 'active') { $query->orWhere(function ($query) { $query->where('flag_enabled', 1)->where('flag_verified', 1); }); @@ -126,8 +123,7 @@ class UserSprunje extends Sprunje * * @return array */ - protected function listStatus() - { + protected function listStatus() { return [ [ 'value' => 'active', @@ -151,8 +147,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortLastActivity($query, $direction) - { + protected function sortLastActivity($query, $direction) { $query->orderBy('activities.occurred_at', $direction); return $this; } @@ -164,8 +159,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortName($query, $direction) - { + protected function sortName($query, $direction) { $query->orderBy('last_name', $direction); return $this; } @@ -177,8 +171,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortStatus($query, $direction) - { + protected function sortStatus($query, $direction) { $query->orderBy('flag_enabled', $direction)->orderBy('flag_verified', $direction); return $this; } |