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

Merge pull request #465 from openclassify/dia

Browse Source 
#1151 Delete sub categories when deleting a parent category [delete a…
This commit is contained in:
Fatih Alp 2020-03-30 17:10:30 +03:00 committed by GitHub
commit 02ac2ff573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -587,9 +587,13 @@ class AdvsController extends PublicController
// Auto approve
if (setting_value('visiosoft.module.advs::auto_approve')) {
if ($adv->status == 'pending_admin' || $adv->status == 'pending_user') {
$adv->status = 'approved';
}
$defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time');
$adv->update([
'status' => 'approved',
'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
'publish_at' => date('Y-m-d H:i:s')
]);
}
$form->render($request->update_id);

7
addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
View File

@ -24,7 +24,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
$cat_ids[] = $cat->id;
$subCat = $cat->parent_category_id;
if ($subCat != null) {
for ($i = 0; $i < 7; $i++) {
for ($i = 0; $i < 10; $i++) {
$parCat = $this->getCat($subCat);
if (isset($parCat)) {
if ($parCat->parent_category_id == "") {
@ -83,9 +83,10 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
public function deleteSubCategories($id)
{
$subCategories = $this->getAllSubCategories($id);
foreach ($subCategories as $subCategory) {
$this->find($subCategory)->delete();
if (count($subCategories)) {
$this->newQuery()->whereIn('id', $subCategories)->delete();
}
return true;
}

29
addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\CatsModule\Category;
use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryModel;
use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,15 +14,18 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
* @var CategoryModel
*/
protected $model;
protected $advRepository;
/**
* Create a new CategoryRepository instance.
*
* @param CategoryModel $model
* @param AdvRepositoryInterface $advRepository
*/
public function __construct(CategoryModel $model)
public function __construct(CategoryModel $model, AdvRepositoryInterface $advRepository)
{
$this->model = $model;
$this->advRepository = $advRepository;
}
public function findById($id)
@ -64,8 +68,31 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
return $this->model->orderBy('sort_order')->get();
}
public function removeCatFromAds($id)
{
$category = $this->find($id);
$catLevelNum = is_null($category->parent_category_id) ? 1 : $this->model->getCatLevel($category->id);
$catLevelText = "cat" . $catLevelNum;
$advs = $this->advRepository->newQuery()->where($catLevelText, $category->id)->get();
foreach ($advs as $adv) {
$nullableCats = array();
for ($i = $catLevelNum; $i <= 10; $i++) {
$nullableCats['cat' . $i] = null;
}
$adv->update($nullableCats);
}
}
public function DeleteCategories($id)
{
// Remove deleted category from ads
$this->removeCatFromAds($id);
// Delete the category
$this->model->find($id)->delete();
// Delete the subcategories
$this->model->deleteSubCategories($id);
}
}

1
addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
View File

@ -209,5 +209,4 @@ class CategoryController extends AdminController
return redirect('admin/cats')->with('success', [$deletedCatsCount . ' categories has been deleted.']);
}
}