Merge branch '4.0-dev' into 4.0multilangsample2

Author: infograf768

administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-08-03.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `#__update_sites` ADD COLUMN `checked_out` int(10) unsigned NOT NULL DEFAULT 0;
+ALTER TABLE `#__update_sites` ADD COLUMN `checked_out_time` datetime NULL DEFAULT NULL;

administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-08-31.sql

@@ -0,0 +1 @@
+INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`, `publish_up`, `publish_down`) VALUES (18, 'main', 'com_messages_manager', 'Private Messages', '', 'Messaging/Private Messages', 'index.php?option=com_messages&view=messages', 'component', 1, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages', 0, '', 17, 20, 0, '*', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00');

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-08-03.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `#__update_sites` ADD COLUMN `checked_out` int(10) unsigned NOT NULL DEFAULT 0;
+ALTER TABLE `#__update_sites` ADD COLUMN `checked_out_time` timestamp without time zone DEFAULT NULL;

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-08-31.sql

@@ -0,0 +1 @@
+INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id", "publish_up", "publish_down") VALUES (18, 'main', 'com_messages_manager', 'Private Messages', '', 'Messaging/Private Messages', 'index.php?option=com_messages&view=messages', 'component', 1, 10, 2, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 20, 0, '*', 1, '1970-01-01 00:00:00', '1970-01-01 00:00:00');

administrator/components/com_associations/View/Associations/HtmlView.php

@@ -82,11 +82,7 @@ public function display($tpl = null)
 			$link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId());
 			Factory::getApplication()->enqueueMessage(Text::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning');
 		}
-		elseif ($this->state->get('itemtype') == '' || $this->state->get('language') == '')
-		{
-			Factory::getApplication()->enqueueMessage(Text::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'), 'notice');
-		}
-		else
+		elseif ($this->state->get('itemtype') != '' && $this->state->get('language') != '')
 		{
 			$type = null;
 

administrator/components/com_associations/tmpl/associations/default.php

@@ -37,7 +37,12 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
-				<?php if (empty($this->items)) : ?>
+				<?php if ($this->state->get('itemtype') == '' || $this->state->get('language') == '') : ?>
+					<div class="alert alert-info">
+						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<?php echo Text::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'); ?>
+					</div>
+				<?php elseif (empty($this->items)) : ?>
 					<div class="alert alert-info">
 						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>

administrator/components/com_cache/tmpl/cache/default.php

@@ -26,7 +26,12 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
-				<?php if (count($this->data) > 0) : ?>
+				<?php if (empty($this->items)) : ?>
+					<div class="alert alert-info">
+						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+					</div>
+				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
 						<?php echo Text::_('COM_CACHE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>

administrator/components/com_categories/Controller/CategoriesController.php

@@ -96,65 +96,16 @@ public function rebuild()
 	}
 
 	/**
-	 * Deletes and returns correctly.
+	 * Gets the URL arguments to append to a list redirect.
 	 *
-	 * @return  void
+	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   3.1.2
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function delete()
+	protected function getRedirectToListAppend()
 	{
-		$this->checkToken();
-
-		// Get items to remove from the request.
-		$cid = $this->input->get('cid', array(), 'array');
 		$extension = $this->input->getCmd('extension', null);
 
-		if (!is_array($cid) || count($cid) < 1)
-		{
-			$this->app->enqueueMessage(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), 'warning');
-		}
-		else
-		{
-			// Get the model.
-			/** @var \Joomla\Component\Categories\Administrator\Model\CategoryModel $model */
-			$model = $this->getModel();
-
-			// Make sure the item ids are integers
-			$cid = ArrayHelper::toInteger($cid);
-
-			// Remove the items.
-			if ($model->delete($cid))
-			{
-				$this->setMessage(Text::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
-			}
-			else
-			{
-				$this->setMessage($model->getError());
-			}
-		}
-
-		$this->setRedirect(Route::_('index.php?option=' . $this->option . '&extension=' . $extension, false));
-	}
-
-	/**
-	 * Check in of one or more records.
-	 *
-	 * Overrides \JControllerAdmin::checkin to redirect to URL with extension.
-	 *
-	 * @return  boolean  True on success
-	 *
-	 * @since   3.6.0
-	 */
-	public function checkin()
-	{
-		// Process parent checkin method.
-		$result = parent::checkin();
-
-		// Override the redirect Uri.
-		$redirectUri = 'index.php?option=' . $this->option . '&view=' . $this->view_list . '&extension=' . $this->input->get('extension', '', 'CMD');
-		$this->setRedirect(Route::_($redirectUri, false), $this->message, $this->messageType);
-
-		return $result;
+		return '&extension=' . $extension;
 	}
 }

administrator/components/com_categories/Field/CategoryeditField.php

@@ -364,6 +364,7 @@ protected function getInput()
 
 		$data['options']        = $this->getOptions();
 		$data['allowCustom']    = $this->allowAdd;
+		$data['customPrefix']   = $this->customPrefix;
 		$data['refreshPage']    = (boolean) $this->element['refresh-enabled'];
 		$data['refreshCatId']   = (string) $this->element['refresh-cat-id'];
 		$data['refreshSection'] = (string) $this->element['refresh-section'];

administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php

@@ -46,6 +46,7 @@
  * @var   array    $options         Options available for this field.
  * @var   array    $inputType       Options available for this field.
  * @var   string   $accept          File types that are accepted.
+ * @var   string   $customPrefix    Optional prefix for new categories.
  */
 
 $html    = array();
@@ -72,9 +73,9 @@
 {
 	$attr2 .= ' allow-custom';
 
-	if ($this->customPrefix !== '')
+	if ($customPrefix !== '')
 	{
-		$attr2 .= ' data-custom_value_prefix="' . $this->customPrefix . '" ';
+		$attr2 .= ' new-item-prefix="' . $customPrefix . '" ';
 	}
 }