Merge branch '6.0-dev' into 6.0-dev/remove-bs-fw

Author: softforge

administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-06-01.sql

@@ -0,0 +1,6 @@
+-- Update link to featured
+
+UPDATE `#__menu`
+SET `link` = 'index.php?option=com_content&view=articles&filter[featured]=1'
+WHERE `link` = 'index.php?option=com_content&view=featured'
+AND `client_id` = 1;

administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-08-11.sql

@@ -0,0 +1,6 @@
+-- Update link to featured
+
+UPDATE "#__menu"
+SET "link" = 'index.php?option=com_content&view=articles&filter[featured]=1'
+WHERE "link" = 'index.php?option=com_content&view=featured'
+AND "client_id" = 1;

administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-06-01.sql

@@ -14,8 +14,8 @@
 			name="featured"
 			type="list"
 			label="JFEATURED"
+			filtermode="selector"
 			class="js-select-submit-on-change"
-			default=""
 			validate="options"
 			>
 			<option value="">COM_CONTENT_SELECT_FEATURED</option>

administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-08-11.sql

@@ -32,7 +32,7 @@
 			title="COM_CONTENT_MENUS_FEATURED"
 			type="component"
 			element="com_content"
-			link="index.php?option=com_content&view=featured"
+			link="index.php?option=com_content&view=articles&filter[featured]=1"
 			class="class:featured"
 		/>
 	</menuitem>

administrator/components/com_content/forms/filter_articles.xml

@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Content\Administrator\Model\ArticlesModel;
 use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
 
@@ -145,9 +146,7 @@ public function getQuickiconContent()
     {
         $model = $this->getModel('articles');
 
-        $model->setState('filter.published', 1);
-
-        $amount = (int) $model->getTotal();
+        $amount = (int) $model->getTotal($featured = '');
 
         $result = [];
 
@@ -157,4 +156,31 @@ public function getQuickiconContent()
 
         echo new JsonResponse($result);
     }
+
+    /**
+     * Method to get the number of published featured articles for quickicons
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function getQuickiconFeatured()
+    {
+        /**
+         * @var ArticlesModel $model
+         */
+        $model = $this->getModel('articles');
+
+        $model->setState('filter.featured', '1');
+
+        $amount = (int) $model->getTotal();
+
+        $result = [];
+
+        $result['amount'] = $amount;
+        $result['sronly'] = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON_SRONLY', $amount);
+        $result['name']   = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON', $amount);
+
+        echo new JsonResponse($result);
+    }
 }

administrator/components/com_content/forms/filter_featured.xml

@@ -62,6 +62,11 @@ public function display($cachable = false, $urlparams = [])
             return false;
         }
 
+        if ($view === 'featured' || $this->input->getInt('featured')) {
+            $this->setRedirect(Route::_('index.php?option=com_content&view=articles&filter[featured]=1', false));
+            return false;
+        }
+
         return parent::display();
     }
 }

administrator/components/com_content/presets/content.xml

@@ -6,13 +6,12 @@
  *
  * @copyright   (C) 2009 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  6.0 will be removed in 8.0
  */
 
 namespace Joomla\Component\Content\Administrator\Controller;
 
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Response\JsonResponse;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -21,107 +20,11 @@
  * Featured content controller class.
  *
  * @since  1.6
+ *
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use \Joomla\Component\Content\Administrator\Controller\ArticlesController instead
+ *              For Quickicons use articles.getQuickiconFeatured()
  */
 class FeaturedController extends ArticlesController
 {
-    /**
-     * Removes an item.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    public function delete()
-    {
-        // Check for request forgeries
-        $this->checkToken();
-
-        $user = $this->app->getIdentity();
-        $ids  = (array) $this->input->get('cid', [], 'int');
-
-        // Access checks.
-        foreach ($ids as $i => $id) {
-            // Remove zero value resulting from input filter
-            if ($id === 0) {
-                unset($ids[$i]);
-
-                continue;
-            }
-
-            if (!$user->authorise('core.delete', 'com_content.article.' . (int) $id)) {
-                // Prune items that you can't delete.
-                unset($ids[$i]);
-                $this->app->enqueueMessage(Text::_('JERROR_CORE_DELETE_NOT_PERMITTED'), 'notice');
-            }
-        }
-
-        if (empty($ids)) {
-            $this->app->enqueueMessage(Text::_('JERROR_NO_ITEMS_SELECTED'), 'error');
-        } else {
-            /** @var \Joomla\Component\Content\Administrator\Model\FeatureModel $model */
-            $model = $this->getModel();
-
-            // Remove the items.
-            if (!$model->featured($ids, 0)) {
-                $this->app->enqueueMessage($model->getError(), 'error');
-            }
-        }
-
-        $this->setRedirect('index.php?option=com_content&view=featured');
-    }
-
-    /**
-     * Method to publish a list of articles.
-     *
-     * @return  void
-     *
-     * @since   1.0
-     */
-    public function publish()
-    {
-        parent::publish();
-
-        $this->setRedirect('index.php?option=com_content&view=featured');
-    }
-
-    /**
-     * Method to get a model object, loading it if required.
-     *
-     * @param   string  $name    The model name. Optional.
-     * @param   string  $prefix  The class prefix. Optional.
-     * @param   array   $config  Configuration array for model. Optional.
-     *
-     * @return  \Joomla\CMS\MVC\Model\BaseDatabaseModel  The model.
-     *
-     * @since   1.6
-     */
-    public function getModel($name = 'Feature', $prefix = 'Administrator', $config = ['ignore_request' => true])
-    {
-        return parent::getModel($name, $prefix, $config);
-    }
-
-    /**
-     * Method to get the number of published featured articles for quickicons
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function getQuickiconContent()
-    {
-        $model = $this->getModel('articles');
-
-        $model->setState('filter.published', 1);
-        $model->setState('filter.featured', 1);
-
-        $amount = (int) $model->getTotal();
-
-        $result = [];
-
-        $result['amount'] = $amount;
-        $result['sronly'] = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON_SRONLY', $amount);
-        $result['name']   = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON', $amount);
-
-        echo new JsonResponse($result);
-    }
 }