DEV: Добавление сайта из Категории

app/Controllers/Item/AddItemController.php

@@ -4,6 +4,7 @@ namespace App\Controllers\Item;
 
 use Hleb\Constructor\Handlers\Request;
 use App\Controllers\Controller;
+use App\Services\Сheck\FacetPresence;
 use App\Models\Item\{WebModel, UserAreaModel};
 use App\Models\{SubscriptionModel, ActionModel, FacetModel, NotificationModel};
 use UserData, Meta, Access;
@@ -19,6 +20,14 @@ class AddItemController extends Controller
         if (Access::trustLevels(config('trust-levels.tl_add_item')) == false) {
             redirect('/web');
         }
+        
+        // Adding from page topic / blog
+        // Добавление со странице категории
+        $category_id   = Request::getInt('category_id');
+
+        if ($category_id) {
+             $category  = FacetPresence::index($category_id, 'id', 'category');
+        }
 
         $count_site = UserData::checkAdmin() ? 0 : UserAreaModel::getUserSitesCount($this->user['id']);
 
@@ -28,8 +37,9 @@ class AddItemController extends Controller
                 'meta'  => Meta::get(__('web.add_website')),
                 'user'  => $this->user,
                 'data'  => [
-                    'sheet'      => 'add',
-                    'type'       => 'web',
+                    'sheet'             => 'add',
+                    'type'              => 'web',
+                    'category'          => $category ?? false,
                     'user_count_site'   => $count_site,
                 ]
             ],

composer.json

@@ -32,7 +32,6 @@
     "phphleb/debugpan": "1.*",
     "phphleb/radjax": "dev-master",
     "phphleb/muller": "dev-main",
-    "phphleb/updater": "^1.0",
     "phphleb/combinator": "dev-main",
     "cocur/slugify": "^4.3",
     "donatj/phpuseragentparser": "dev-master",

resources/views/default/_block/form/select/category.php

@@ -54,21 +54,17 @@
     <?php if ($action == 'edit') : ?>
       tagify.addTags(JSON.parse('<?= json_encode($data['category_arr']) ?>'))
     <?php else : ?>
-      <?php if (!empty($data['topic'])) : ?>
-        <?php if ($data['topic']) :
-          $id     = $data['topic']['facet_id'];
-          $title  = $data['topic']['facet_title'];
+        <?php if ($category) :
+          $id     = $category['facet_id'];
+          $title  = $category['facet_title'];
         ?>
           tagify.addTags([{
-            value: '<?= $id; ?>',
-            facet_title: '<?= $title; ?>'
+            id: '<?= $id; ?>',
+            value: '<?= $title; ?>'
           }])
         <?php else : ?>
           tagify.addTags([])
         <?php endif; ?>
-      <?php else : ?>
-        tagify.addTags([])
-      <?php endif; ?>
     <?php endif;  ?>
   });
 </script>

resources/views/default/_block/navigation/item/menu.php

@@ -1,22 +1,24 @@
-<?php $user_count_site = $data['user_count_site'] ?? 0; ?>
+<?php 
+$category = $data['category'] ?? false;
+$url = $category ? url('content.add', ['type' => 'item']) . '/' . $category['facet_id'] : url('content.add', ['type' => 'item']);
+$user_count_site = $data['user_count_site'] ?? false; 
+?>
 
 <li>
   <a <?= is_current(url('web.user.sites')) ? 'class="active"' : ''; ?> href="<?= url('web.user.sites'); ?>">
     <?= __('web.my_website'); ?>
-    <?php if ($user_count_site != 0) : ?>
+    <?php if ($user_count_site != false) : ?>
       (<?= $user_count_site; ?>)
     <?php endif; ?>
   </a>
 </li>
 
-<?php if (Access::trustLevels(config('trust-levels.tl_add_item'))) : ?>
-  <?php if ($user_count_site == 0 || UserData::checkAdmin()) : ?>
-    <li>
-      <a href="<?= url('content.add', ['type' => 'item']); ?>">
-        <?= __('web.add_website'); ?>
-      </a>
-    </li>
-  <?php endif; ?>
+<?php if (Access::trustLevels(config('trust-levels.tl_add_item')) || ($user_count_site != false)) : ?>
+  <li>
+    <a href="<?= $url; ?>">
+      <?= __('web.add_website'); ?>
+    </a>
+  </li>
 <?php endif; ?>
 
 <li>

resources/views/default/content/item/add.php

@@ -15,7 +15,7 @@
 
     <form action="<?= url('content.create', ['type' => 'item']); ?>" class="max-w780" method="post">
       <?= csrf_field() ?>
-      <?= insert('/_block/form/select/category', ['data' => ['topic' => false], 'action' => 'add']); ?>
+      <?= insert('/_block/form/select/category', ['category' => $data['category'], 'action' => 'add']); ?>
       <?= insert('/_block/form/add-website'); ?>
       <?= Html::sumbit(__('web.add')); ?>
     </form>

routes/main.php

@@ -30,8 +30,11 @@ Route::before('Designator', [UserData::USER_FIRST_LEVEL, '>='])->getGroup();
     Route::endGroup();    
 
     Route::type(['get', 'post'])->get('/folder/content/save')->controller('FolderController@addFolderContent');
- 
+
+    // Add directly from the Themes / Categories page
+    // Добавление непосредственно со страницы Темы / Категории
     Route::get('/add/post/{facet_id}')->controller('Post\AddPostController')->where(['facet_id' => '[0-9]+']);
+    Route::get('/add/item/{category_id}')->controller('Item\AddItemController@index')->where(['category_id' => '[0-9]+']);
 
     Route::get('/post/img/{id}/remove')->controller('Post\EditPostController@imgPostRemove')->where(['id' => '[0-9]+']);
 
@@ -146,5 +149,3 @@ Route::get('/rss-feed/topic/{slug}')->controller('RssController@rssFeed')->where
 Route::get('/search/opensearch')->controller('SearchController@openSearch')->name('opensearch');
 
 // Route::bottleneck('/attention', true, "TECHNICAL WORKS ON THE SERVER");
-
-require 'admin.php';