hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-24 22:11:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #511 from openclassify/vedat

Browse Source 
#1279 sort by email and sort by created_at
This commit is contained in:
Fatih Alp 2020-04-23 23:34:51 +03:00 committed by GitHub
commit b8f06a16c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\DefaultadminTheme\Listener; <?php namespace Visiosoft\DefaultadminTheme\Listener;
use Anomaly\Streams\Platform\Support\Collection; use Anomaly\Streams\Platform\Ui\Table\Component\Header\Header;
use Illuminate\Support\Collection;
use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Type\SearchFilter; use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Type\SearchFilter;
use Anomaly\Streams\Platform\Ui\Table\Event\TableIsQuerying; use Anomaly\Streams\Platform\Ui\Table\Event\TableIsQuerying;
use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
@ -52,16 +53,36 @@ class AddGsmFilter
$builder->setColumns([ $builder->setColumns([
'email', 'email',
'gsm_phone', 'gsm_phone',
'created_at' => [
'value' => 'entry.created_at'
],
'status' => [ 'status' => [
'value' => 'entry.status_label', 'value' => 'entry.status_label',
],] ],]
); );
$c = Collection::make([ $builder->setOptions([
['heading' => 'anomaly.module.users::field.email.name'], 'order_by' =>
['heading' => 'visiosoft.module.profile::field.gsm_phone.name'], [
['heading' => 'anomaly.module.users::field.status.name'], 'email' => 'DESC'
],
]); ]);
$builder->getTable()->setHeaders($c);
$collection = new Collection();
$header_email = new Header();
$header_email = $header_email->setBuilder($builder)->setHeading('anomaly.module.users::field.email.name')->setSortable(true)->setSortColumn('email');
$header_phone = new Header();
$header_gsm_phone = $header_phone->setBuilder($builder)->setHeading('visiosoft.module.profile::field.gsm_phone.name');
$header_created_at = new Header();
$header_created_at = $header_created_at->setBuilder($builder)->setHeading('streams::entry.created_at')->setSortColumn('created_at')->setSortable(true);
$header_status = new Header();
$header_status = $header_status->setBuilder($builder)->setHeading('anomaly.module.users::field.status.name');
$collection = $collection->add($header_email);
$collection = $collection->add($header_gsm_phone);
$collection = $collection->add($header_created_at);
$collection = $collection->add($header_status);
$builder->getTable()->setHeaders($collection);
} }
/** /**

2
addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
View File

@ -7,6 +7,7 @@ use Anomaly\UsersModule\User\UserActivator;
use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Support\Facades\Auth;
/** /**
* Class RegisterFormHandler * Class RegisterFormHandler
@ -70,5 +71,6 @@ class Register2FormHandler
$activator->force($user); $activator->force($user);
$events->dispatch(new UserHasRegistered($user)); $events->dispatch(new UserHasRegistered($user));
Auth::login($user);
} }
} }