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

Merge pull request #963 from openclassify/vedatakdgn

Browse Source 
fixed sentry errors && added education seeder
This commit is contained in:
Fatih Alp 2021-02-24 12:09:47 +03:00 committed by GitHub
commit 3a3ddc4cea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 66 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -71,7 +71,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function userAdv($nullable_ad = false, $checkRole = true)
{
if (Auth::user()->hasRole('admin') && $checkRole) {
if ($user = Auth::user() and $user->hasRole('admin') && $checkRole) {
return $this->getAdv(null, $nullable_ad);
} else {
return $this->getAdv(null, $nullable_ad)

8
addons/default/visiosoft/profile-module/resources/lang/it/field.php
View File

@ -50,7 +50,7 @@ return [
'name' => 'Numero di telefono di terra'
],
'office_phone' => [
'name' => 'Numero di telefono dell\\'ufficio'
'name' => 'Numero di telefono dell\'ufficio'
],
'register_type' => [
'name' => 'Tipo di registro'
@ -158,7 +158,7 @@ return [
'name' => 'In attesa di approvazione'
],
'menu_delete_account' => [
'name' => 'Chiudere l\\'account'
'name' => 'Chiudere l\'account'
],
'menu_my_ads' => [
'name' => 'I miei annunci'
@ -170,7 +170,7 @@ return [
'name' => 'Ciao'
],
'menu_last_msg' => [
'name' => 'Hai effettuato l\\'ultimo accesso alle'
'name' => 'Hai effettuato l\'ultimo accesso alle'
],
'menu_packages' => [
'name' => 'I miei pacchetti'
@ -270,7 +270,7 @@ return [
'name' => 'Totale',
],
'order_date' => [
'name' => 'Data dell\\'ordine',
'name' => 'Data dell\'ordine',
],
'order_no' => [
'name' => 'ID ordine',

42
addons/default/visiosoft/profile-module/src/Education/EducationSeeder.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\ProfileModule\Education;
use Anomaly\Streams\Platform\Database\Seeder\Seeder;
use Visiosoft\ProfileModule\Education\Contract\EducationRepositoryInterface;
class EducationSeeder extends Seeder
{
@ -10,6 +11,45 @@ class EducationSeeder extends Seeder
*/
public function run()
{
//
$repository = app(EducationRepositoryInterface::class);
$educations = [
[
'en' => [
'name' => 'Primary School',
],
'tr' => [
'name' => 'İlk Okul',
],
],
[
'en' => [
'name' => 'Middle School',
],
'tr' => [
'name' => 'Orta Okul',
],
],
[
'en' => [
'name' => 'High School',
],
'tr' => [
'name' => 'Lise',
],
],
[
'en' => [
'name' => 'University',
],
'tr' => [
'name' => 'Üniversite',
],
],
];
foreach ($educations as $education) {
$repository->create($education);
}
}
}

8
addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php
View File

@ -3,6 +3,7 @@
use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface;
use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface;
use Anomaly\Streams\Platform\Database\Seeder\Seeder;
use Visiosoft\ProfileModule\Education\EducationSeeder;
use Visiosoft\ProfileModule\Seed\UsersFieldsSeeder;
class ProfileModuleSeeder extends Seeder
@ -25,14 +26,14 @@ class ProfileModuleSeeder extends Seeder
/**
* Create a new FolderSeeder instance.
*
* @param DiskRepositoryInterface $disks
* @param DiskRepositoryInterface $disks
* @param FolderRepositoryInterface $folders
*/
public function __construct(DiskRepositoryInterface $disks, FolderRepositoryInterface $folders)
{
parent::__construct();
$this->disks = $disks;
$this->disks = $disks;
$this->folders = $folders;
}
@ -43,5 +44,8 @@ class ProfileModuleSeeder extends Seeder
{
// Users Fields Seeder
$this->call(UsersFieldsSeeder::class);
//Educations Seeder
$this->call(EducationSeeder::class);
}
}

20
app/Providers/AppServiceProvider.php
View File

@ -14,16 +14,16 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
view()->composer('*', function ($view) {
//Hidden menu items in sidebar on dashboard
if (auth()->check() and template()->get('cp')){
template()->get('cp')->getNavigation()->get('anomaly.module.variables')->setClass('hidden');
template()->get('cp')->getNavigation()->get('anomaly.module.system')->setClass('hidden');
template()->get('cp')->getNavigation()->get('anomaly.module.redirects')->setClass('hidden');
template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')->setClass('hidden');
}
//Auto Language Switcher
if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
view()->composer('*', function ($view) {
//Hidden menu items in sidebar on dashboard
if (auth()->check() and template()->get('cp')) {
$is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false;
$is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false;
$is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false;
$is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false;
}
//Auto Language Switcher
if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language
$acceptLang = config('streams::locales.enabled'); //Supported Language
$lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en');

5
database/seeds/DatabaseSeeder.php
View File

@ -14,6 +14,7 @@ use Anomaly\UsersModule\User\UserActivator;
use Illuminate\Database\Seeder;
use Anomaly\DashboardModule\Widget\Contract\WidgetRepositoryInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\DB;
class DatabaseSeeder extends Seeder
@ -190,5 +191,7 @@ class DatabaseSeeder extends Seeder
],
]);
};
}
Artisan::call('assets:clear');
}
}