Merge branch '4.0-dev' into refactor-system-screen

joomla · Dec 5, 2018 · 81ea316 · 81ea316
2 parents aee8b38 + 5df86bc
commit 81ea316
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 72 deletions.
diff --git a/administrator/components/com_cache/Controller/DisplayController.php b/administrator/components/com_cache/Controller/DisplayController.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Session\Session;

diff --git a/administrator/components/com_categories/Controller/DisplayController.php b/administrator/components/com_categories/Controller/DisplayController.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;

diff --git a/administrator/components/com_categories/Field/CategoryeditField.php b/administrator/components/com_categories/Field/CategoryeditField.php
@@ -11,11 +11,11 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * Category Edit field..

diff --git a/administrator/components/com_fields/Model/GroupModel.php b/administrator/components/com_fields/Model/GroupModel.php
@@ -68,8 +68,6 @@ public function save($data)
 	}
 
 	/**
-<<<<<<< HEAD:administrator/components/com_fields/Model/GroupModel.php
-=======
 	 * Method to get a table object, load it if necessary.
 	 *
 	 * @param   string  $name     The table name. Optional.
@@ -81,18 +79,16 @@ public function save($data)
 	 * @since   3.7.0
 	 * @throws  Exception
 	 */
-	public function getTable($name = 'Group', $prefix = 'FieldsTable', $options = array())
+	public function getTable($name = 'Group', $prefix = 'Administrator', $options = array())
 	{
-		if (strpos(JPATH_COMPONENT, 'com_fields') === false)
-		{
-			$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_fields/tables');
-		}
+		// Default to text type
+		$table       = parent::getTable($name, $prefix, $options);
+		$table->type = 'text';
 
-		return JTable::getInstance($name, $prefix, $options);
+		return $table;
 	}
 
 	/**
->>>>>>> 3.8.7:administrator/components/com_fields/models/group.php
 	 * Abstract method for getting the form from the model.
 	 *
 	 * @param   array    $data      Data for the form.

diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php
@@ -20,6 +20,9 @@
 
 $app = Factory::getApplication();
 $input = $app->input;
+
+$this->useCoreUI = true;
+
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_fields&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">

diff --git a/administrator/components/com_fields/tmpl/groups/default_batch_body.php b/administrator/components/com_fields/tmpl/groups/default_batch_body.php
@@ -8,7 +8,6 @@
  */
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Layout\LayoutHelper;
 
 ?>

diff --git a/administrator/components/com_installer/Controller/DisplayController.php b/administrator/components/com_installer/Controller/DisplayController.php
@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Client\ClientHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 

diff --git a/administrator/components/com_joomlaupdate/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/Controller/DisplayController.php
@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Client\ClientHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 
 /**

diff --git a/administrator/components/com_media/src/Model/FileModel.php b/administrator/components/com_media/src/Model/FileModel.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
 

diff --git a/administrator/components/com_menus/Model/MenusModel.php b/administrator/components/com_menus/Model/MenusModel.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;

diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Helper\ModuleHelper;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;

diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -9,7 +9,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
@@ -57,6 +56,6 @@
 	</ul>
 <?php else : ?>
 	<div class="alert alert-warning">
-		<?php echo JText::_('MOD_SAMPLEDATA_NOTAVAILABLE'); ?>
+		<?php echo Text::_('MOD_SAMPLEDATA_NOTAVAILABLE'); ?>
 	</div>
 <?php endif; ?>
diff --git a/administrator/templates/atum/scss/template-rtl.scss b/administrator/templates/atum/scss/template-rtl.scss
@@ -115,18 +115,37 @@ body {
     border-radius: $border-radius 0 0 $border-radius;
   }
 
-  .close {
-    float: left;
-  }
-
   .parent .collapse-arrow::after {
     right: auto;
     left: 15px;
     content: "\f0d9";
   }
 
-  li a span {
-    float: right;
+  .has-arrow::after {
+    left: 1rem;
+    right: inherit;
+    transform: rotate(135deg) translate(0,-50%);
+  }
+
+  ul a::before {
+    right: 18px;
+  }
+
+  .active .no-dropdown .sidebar-item-title {
+    margin-right: 28px;
+  }
+
+  .dropdown-submenu .sidebar-item-title {
+    margin-right: 28px;
+  }
+
+  .dropdown-submenu .no-dropdown .sidebar-item-title {
+    margin-right: 44px;
+  }
+
+  ul ul a::before {
+    right: 34px;
+    left: 0;
   }
 }
 

diff --git a/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -22,15 +22,14 @@
         const updateInfoList = JSON.parse(response);
 
         if (updateInfoList instanceof Array) {
-          const updateInfo = updateInfoList.shift();
-
-          if (updateInfo.version === options.version) {
+          if (updateInfoList.length === 0) {
             // No updates
             link.classList.add('success');
             linkSpans.forEach((span) => {
               span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE');
             });
           } else {
+            const updateInfo = updateInfoList.shift();
 
             if (updateInfo.version !== options.version) {
               const messages = {
@@ -52,6 +51,7 @@
                 span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light"> \u200E ${updateInfo.version}</span>`);
               });
             } else {
+              link.classList.add('success');
               linkSpans.forEach((span) => {
                 span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE');
               });

diff --git a/installation/template/scss/template-rtl.scss b/installation/template/scss/template-rtl.scss
@@ -89,3 +89,12 @@ textarea.noResize {
 .j-install-last-step .fa {
   display: inline;
 }
+
+.j-install-step-header span {
+  margin-left: 5px;
+  margin-right: auto; }
+
+#jform_db_prefix {
+  direction: ltr;
+  text-align: right;
+}
diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php
@@ -24,7 +24,6 @@
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Menu\AbstractMenu;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
-use Joomla\CMS\MVC\Factory\MVCFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface;
 

diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
@@ -98,17 +98,16 @@ public function checkin($pk = null)
 				return false;
 			}
 
-			$checkedOutField = $table->getColumnAlias('checked_out');
-			$checkedOutTimeField = $table->getColumnAlias('checked_out_time');
-
 			// If there is no checked_out or checked_out_time field, just return true.
-			if (!$table->hasField($checkedOutField) || !$table->hasField($checkedOutTimeField))
+			if (!$table->hasField('checked_out') || !$table->hasField('checked_out_time'))
 			{
 				return true;
 			}
 
+			$checkedOutField = $table->getColumnAlias('checked_out');
+
 			// Check if this is the user having previously checked out the row.
-			if ($table->{$checkedOutField} > 0 && $table->{$checkedOutField} != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
+			if ($table->$checkedOutField > 0 && $table->$checkedOutField != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
 			{
 				$this->setError(Text::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'));
 
@@ -151,19 +150,17 @@ public function checkout($pk = null)
 				return false;
 			}
 
-			$checkedOutField = $table->getColumnAlias('checked_out');
-			$checkedOutTimeField = $table->getColumnAlias('checked_out_time');
-
 			// If there is no checked_out or checked_out_time field, just return true.
-			if (!$table->hasField($checkedOutField) || !$table->hasField($checkedOutTimeField))
+			if (!$table->hasField('checked_out') || !$table->hasField('checked_out_time'))
 			{
 				return true;
 			}
 
-			$user = Factory::getUser();
+			$user            = Factory::getUser();
+			$checkedOutField = $table->getColumnAlias('checked_out');
 
 			// Check if this is the user having previously checked out the row.
-			if ($table->{$checkedOutField} > 0 && $table->{$checkedOutField} != $user->get('id'))
+			if ($table->$checkedOutField > 0 && $table->$checkedOutField != $user->get('id'))
 			{
 				$this->setError(Text::_('JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH'));
 

diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php
@@ -12,7 +12,6 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Object\CMSObject;

diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
@@ -1333,11 +1333,9 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = '')
 				->where('parent_id = %d');
 
 			// If the table has an ordering field, use that for ordering.
-			$orderingField = $this->getColumnAlias('ordering');
-
-			if ($this->hasField($orderingField))
+			if ($this->hasField('ordering'))
 			{
-				$query->order('parent_id, ' . $this->_db->quoteName($orderingField) . ', lft');
+				$query->order('parent_id, ' . $this->_db->quoteName($this->getColumnAlias('ordering')) . ', lft');
 			}
 			else
 			{