Revert "[New Feature] Multilingual: Propagating existing associations…

… if desired (#21321)" (#21408) This reverts commit 8bacca9.
joomla · Sep 1, 2018 · f5027d4 · f5027d4
1 parent 82042bf
commit f5027d4
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 704 deletions.
diff --git a/administrator/components/com_categories/controllers/ajax.json.php b/administrator/components/com_categories/controllers/ajax.json.php
diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
@@ -455,7 +455,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
-					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);

diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php
@@ -9,8 +9,6 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Language\LanguageHelper;
-
 /**
  * Supports a modal category picker.
  *
@@ -44,13 +42,10 @@ protected function getInput()
 			$extension = (string) JFactory::getApplication()->input->get('extension', 'com_content');
 		}
 
-		$allowNew       = ((string) $this->element['new'] == 'true');
-		$allowEdit      = ((string) $this->element['edit'] == 'true');
-		$allowClear     = ((string) $this->element['clear'] != 'false');
-		$allowSelect    = ((string) $this->element['select'] != 'false');
-		$allowPropagate = ((string) $this->element['propagate'] == 'true');
-
-		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
 
 		// Load language.
 		JFactory::getLanguage()->load('com_categories', JPATH_ADMINISTRATOR);
@@ -83,8 +78,6 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 				}
 				");
 
-				JText::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
-
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -186,23 +179,6 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 				. '</a>';
 		}
 
-		// Propagate category button
-		if ($allowPropagate && count($languages) > 2)
-		{
-			// Strip off language tag at the end
-			$tagLength = (int) strlen($this->element['language']);
-			$callbackFunctionStem = substr("jSelectCategory_" . $this->id, 0, -$tagLength);
-
-			$html .= '<a'
-			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
-			. ' id="' . $this->id . '_propagate"'
-			. ' href="#"'
-			. ' title="' . JHtml::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
-			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
-			. '<span class="icon-refresh" aria-hidden="true"></span>' . JText::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
-			. '</a>';
-		}
-
 		$html .= '</span>';
 
 		// Select category modal.

diff --git a/administrator/components/com_contact/controllers/ajax.json.php b/administrator/components/com_contact/controllers/ajax.json.php
diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php
@@ -560,7 +560,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 					$field->addAttribute('new', 'true');
 					$field->addAttribute('edit', 'true');
 					$field->addAttribute('clear', 'true');
-					$field->addAttribute('propagate', 'true');
 				}
 
 				$form->load($addform, false);

diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php
@@ -9,8 +9,6 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Language\LanguageHelper;
-
 /**
  * Supports a modal contact picker.
  *
@@ -35,13 +33,10 @@ class JFormFieldModal_Contact extends JFormField
 	 */
 	protected function getInput()
 	{
-		$allowNew       = ((string) $this->element['new'] == 'true');
-		$allowEdit      = ((string) $this->element['edit'] == 'true');
-		$allowClear     = ((string) $this->element['clear'] != 'false');
-		$allowSelect    = ((string) $this->element['select'] != 'false');
-		$allowPropagate = ((string) $this->element['propagate'] == 'true');
-
-		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
 
 		// Load language
 		JFactory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
@@ -74,8 +69,6 @@ function jSelectContact_" . $this->id . "(id, title, object) {
 				}
 				");
 
-				JText::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
-
 				$scriptSelect[$this->id] = true;
 			}
 		}
@@ -175,23 +168,6 @@ function jSelectContact_" . $this->id . "(id, title, object) {
 				. '</a>';
 		}
 
-		// Propagate contact button
-		if ($allowPropagate && count($languages) > 2)
-		{
-			// Strip off language tag at the end
-			$tagLength = (int) strlen($this->element['language']);
-			$callbackFunctionStem = substr("jSelectContact_" . $this->id, 0, -$tagLength);
-
-			$html .= '<a'
-			. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
-			. ' id="' . $this->id . '_propagate"'
-			. ' href="#"'
-			. ' title="' . JHtml::tooltipText('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
-			. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
-			. '<span class="icon-refresh" aria-hidden="true"></span>' . JText::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
-			. '</a>';
-		}
-
 		$html .= '</span>';
 
 		// Select contact modal

diff --git a/administrator/components/com_content/controllers/ajax.json.php b/administrator/components/com_content/controllers/ajax.json.php