#2692 ads image upload extension fixed

This commit is contained in:
Muammer Top 2020-12-09 15:05:48 +03:00
parent 9db731dc6c
commit a8e45acb04
2 changed files with 133 additions and 120 deletions

View File

@ -1,15 +1,20 @@
{% set folders = entries('files','folders').whereIn('slug',field_type.configGet('folders')).get() %}
{% set allowed_types = {} %}
{% for mimes in folders.pluck('allowed_types.value').all() %}
{% set allowed_types = allowed_types|merge(mimes) %}
{% endfor %}
<div class="modal-body"> <div class="modal-body">
<div class="dropzone" <div class="dropzone"
data-folder="1" data-folder="1"
data-icon="{{ icon('upload')|escape }}" data-icon="{{ icon('upload')|escape }}"
data-max-size="{{ max_upload_size() }}" data-max-size="{{ max_upload_size() }}"
data-message="{{ trans('visiosoft.field_type.media::message.upload') }}" data-message="{{ trans('visiosoft.field_type.media::message.upload') }}"
data-loading="{{ trans('visiosoft.field_type.media::message.loading') }}" data-loading="{{ trans('visiosoft.field_type.media::message.loading') }}"
data-uploading="{{ trans('visiosoft.field_type.media::message.uploading') }}" data-uploading="{{ trans('visiosoft.field_type.media::message.uploading') }}"
data-overwrite="{{ trans('anomaly.field_type.file::message.overwrite') }}" data-overwrite="{{ trans('anomaly.field_type.file::message.overwrite') }}"
data-max-parallel="{{ setting_value('anomaly.module.files::max_parallel_uploads', 3) }}" data-max-parallel="{{ setting_value('anomaly.module.files::max_parallel_uploads', 3) }}"
data-allowed="{{ folder.allowed_types.value ? '.' ~ folder.allowed_types.value|join(',.') }}"></div> data-allowed="{{ (count(allowed_types)) ?'.'~allowed_types|join(',.'):'' }}"></div>
<div class="uploads"></div> <div class="uploads"></div>
</div> </div>

View File

@ -18,135 +18,143 @@ use Illuminate\Support\Facades\DB;
class DatabaseSeeder extends Seeder class DatabaseSeeder extends Seeder
{ {
protected $widgets; protected $widgets;
protected $menus; protected $menus;
protected $users; protected $users;
protected $roles; protected $roles;
protected $activator; protected $activator;
protected $disks; protected $disks;
protected $folders; protected $folders;
public function __construct( public function __construct(
WidgetRepositoryInterface $widgets, WidgetRepositoryInterface $widgets,
MenuRepositoryInterface $menus, MenuRepositoryInterface $menus,
UserRepositoryInterface $users, UserRepositoryInterface $users,
DiskRepositoryInterface $disks, DiskRepositoryInterface $disks,
FolderRepositoryInterface $folders, FolderRepositoryInterface $folders,
RoleRepositoryInterface $roles, RoleRepositoryInterface $roles,
UserActivator $activator UserActivator $activator
) )
{ {
$this->widgets = $widgets; $this->widgets = $widgets;
$this->menus = $menus; $this->menus = $menus;
$this->users = $users; $this->users = $users;
$this->roles = $roles; $this->roles = $roles;
$this->activator = $activator; $this->activator = $activator;
$this->disks = $disks; $this->disks = $disks;
$this->folders = $folders; $this->folders = $folders;
} }
public function run() public function run()
{ {
$admin = $this->roles->findBySlug('admin'); $admin = $this->roles->findBySlug('admin');
$this->users->unguard(); $this->users->unguard();
$this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete(); $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete();
$visiosoft_administrator = $this->users->create( $visiosoft_administrator = $this->users->create(
[ [
'display_name' => 'openclassify', 'display_name' => 'openclassify',
'email' => "info@openclassify.com", 'email' => "info@openclassify.com",
'username' => "openclassify", 'username' => "openclassify",
'password' => "openclassify", 'password' => "openclassify",
] ]
); );
$visiosoft_administrator->roles()->sync([$admin->getId()]); $visiosoft_administrator->roles()->sync([$admin->getId()]);
$this->activator->force($visiosoft_administrator); $this->activator->force($visiosoft_administrator);
//Footer Link //Footer Link
LinkModel::query()->forceDelete(); LinkModel::query()->forceDelete();
$repository = new EntryRepository(); $repository = new EntryRepository();
$repository->setModel(new UrlLinkTypeModel()); $repository->setModel(new UrlLinkTypeModel());
$menu = $this->menus->findBySlug('footer'); $menu = $this->menus->findBySlug('footer');
$openclassify = $repository->create( $openclassify = $repository->create(
[ [
'en' => [ 'en' => [
'title' => 'OpenClassify.com', 'title' => 'OpenClassify.com',
], ],
'url' => 'https://openclassify.com/', 'url' => 'https://openclassify.com/',
] ]
); );
$visiosoft = $repository->create( $visiosoft = $repository->create(
[ [
'en' => [ 'en' => [
'title' => 'Visiosoft Inc.', 'title' => 'Visiosoft Inc.',
], ],
'url' => 'https://visiosoft.com.tr/', 'url' => 'https://visiosoft.com.tr/',
] ]
); );
LinkModel::query()->create( LinkModel::query()->create(
[ [
'menu' => $menu, 'menu' => $menu,
'target' => '_blank', 'target' => '_blank',
'entry' => $openclassify, 'entry' => $openclassify,
'type' => 'anomaly.extension.url_link_type', 'type' => 'anomaly.extension.url_link_type',
] ]
); );
LinkModel::query()->create( LinkModel::query()->create(
[ [
'menu' => $menu, 'menu' => $menu,
'target' => '_blank', 'target' => '_blank',
'entry' => $visiosoft, 'entry' => $visiosoft,
'type' => 'anomaly.extension.url_link_type', 'type' => 'anomaly.extension.url_link_type',
] ]
); );
DB::table('files_files')->truncate(); DB::table('files_files')->truncate();
$repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/";
file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r')); file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r'));
file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r')); file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r'));
file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r')); file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r'));
file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r")); file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r"));
file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r")); file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r"));
Model::unguard(); Model::unguard();
DB::unprepared(file_get_contents(storage_path('advs.sql'))); DB::unprepared(file_get_contents(storage_path('advs.sql')));
DB::unprepared(file_get_contents(storage_path('categories.sql'))); DB::unprepared(file_get_contents(storage_path('categories.sql')));
DB::unprepared(file_get_contents(storage_path('settings.sql'))); DB::unprepared(file_get_contents(storage_path('settings.sql')));
Model::reguard(); Model::reguard();
$zip = new ZipArchive(); $zip = new ZipArchive();
$zip->open(storage_path('images.zip'), ZipArchive::CREATE); $zip->open(storage_path('images.zip'), ZipArchive::CREATE);
$zip->extractTo(storage_path('streams/default/files-module/local/images/')); $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
$zip->open(storage_path('cats.zip'), ZipArchive::CREATE); $zip->open(storage_path('cats.zip'), ZipArchive::CREATE);
$zip->extractTo(storage_path('streams/default/files-module/local/images/')); $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
$zip->close(); $zip->close();
$this->call(widgetSeeder::class); $this->call(widgetSeeder::class);
//Create Store Icon Folder //Create Store Icon Folder
if (!$this->folders->findBySlug('ads_excel')) { if (!$this->folders->findBySlug('ads_excel')) {
$disk = $this->disks->findBySlug('local'); $disk = $this->disks->findBySlug('local');
$this->folders->create([ $this->folders->create([
'en' => [ 'en' => [
'name' => 'Ads Excel', 'name' => 'Ads Excel',
'description' => 'A folder for Ads Excel.', 'description' => 'A folder for Ads Excel.',
], ],
'slug' => 'ads_excel', 'slug' => 'ads_excel',
'disk' => $disk 'disk' => $disk
]); ]);
}; };
}
if ($images_folder = $this->folders->findBySlug('images')) {
$images_folder->update([
'allowed_types' => [
'jpg', 'jpeg','png'
],
]);
}
}
} }