Skip to content
Browse files

# [#30226] *TAGS: Getting rid of all aspects concerning lang

associations
  • Loading branch information...
1 parent d8ba509 commit 3dee52da12fd633f239229ca819be8f6f9a8bb80 @infograf768 infograf768 committed Apr 7, 2013
View
33 administrator/components/com_tags/helpers/tags.php
@@ -86,37 +86,4 @@ public static function getActions()
return $result;
}
-
- public static function getAssociations($pk)
- {
- $associations = array();
- $db = JFactory::getDbo();
- $query = $db->getQuery(true)
- ->from('#__tags as c')
- ->join('INNER', '#__associations as a ON a.id = c.id AND a.context=' . $db->quote('com_tags.item'))
- ->join('INNER', '#__associations as a2 ON a.key = a2.key')
- ->join('INNER', '#__tags as c2 ON a2.id = c2.id')
- ->where('c.id =' . (int) $pk);
- $select = array(
- 'c2.language',
- $query->concatenate(array('c2.id', 'c2.alias'), ':') . ' AS id',
- );
- $query->select($select);
- $db->setQuery($query);
- $contactitems = $db->loadObjectList('language');
-
- // Check for a database error.
- if ($error = $db->getErrorMsg())
- {
- JError::raiseWarning(500, $error);
- return false;
- }
-
- foreach ($contactitems as $tag => $item)
- {
- $associations[$tag] = $item;
- }
-
- return $associations;
- }
}
View
24 administrator/components/com_tags/models/tag.php
@@ -338,30 +338,6 @@ public function save($data)
return false;
}
- // We will have to discuss how to think about language and tags
- // $app = JFactory::getApplication();
- /*$assoc = $this->getAssociations();
- if ($assoc)
- {
- // Adding self to the association
- $associations = $data['associations'];
-
- foreach ($associations as $tag => $id)
- {
- if (empty($id))
- {
- unset($associations[$tag]);
- }
- }
-
- if ($error = $db->getErrorMsg())
- {
- $this->setError($error);
- return false;
- }
-
- }*/
-
// Trigger the onContentAfterSave event.
$dispatcher->trigger($this->event_after_save, array($this->option . '.' . $this->name, &$table, $isNew));
View
10 administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -42,9 +42,6 @@
<li><a href="#publishing" data-toggle="tab"><?php echo JText::_('COM_TAGS_FIELDSET_PUBLISHING');?></a></li>
<li><a href="#options" data-toggle="tab"><?php echo JText::_('COM_TAGS_FIELDSET_OPTIONS');?></a></li>
<li><a href="#metadata" data-toggle="tab"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS');?></a></li>
- <?php if ($this->assoc) : ?>
- <li><a href="#associations" data-toggle="tab"><?php echo JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS');?></a></li>
- <?php endif; ?>
</ul>
<div class="tab-content">
@@ -156,13 +153,6 @@
<?php echo $this->loadTemplate('metadata'); ?>
</fieldset>
</div>
- <?php if ($this->assoc) : ?>
- <div class="tab-pane" id="associations">
- <fieldset>
- <?php echo $this->loadTemplate('associations'); ?>
- </fieldset>
- </div>
- <?php endif; ?>
<?php if ($this->canDo->get('core.admin')): ?>
<div class="tab-pane" id="permissions">
<fieldset>
View
4 administrator/components/com_tags/views/tag/view.html.php
@@ -24,8 +24,6 @@ class TagsViewTag extends JViewLegacy
protected $state;
- protected $assoc;
-
/**
* Display the view
*/
@@ -35,8 +33,6 @@ public function display($tpl = null)
$this->item = $this->get('Item');
$this->state = $this->get('State');
$this->canDo = TagsHelper::getActions($this->state->get('tags.component'));
- $this->assoc = $this->get('Assoc');
-
$input = JFactory::getApplication()->input;
// Check for errors.
View
12 administrator/components/com_tags/views/tags/tmpl/default.php
@@ -102,11 +102,6 @@
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
- <?php if ($this->assoc) : ?>
- <th width="5%" class="hidden-phone">
- <?php echo JHtml::_('grid.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
- </th>
- <?php endif; ?>
<th width="5%" class="nowrap hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
@@ -207,13 +202,6 @@
<td class="small hidden-phone">
<?php echo $this->escape($item->access_title); ?>
</td>
- <?php if ($this->assoc): ?>
- <td class="center hidden-phone">
- <?php if ($item->association):?>
- <?php echo JHtml::_('TagsAdministrator.association', $item->id); ?>
- <?php endif;?>
- </td>
- <?php endif;?>
<td class="small nowrap hidden-phone">
<?php if ($item->language == '*') : ?>
<?php echo JText::alt('JALL', 'language'); ?>
View
2 administrator/components/com_tags/views/tags/view.html.php
@@ -24,8 +24,6 @@ class TagsViewTags extends JViewLegacy
protected $state;
- protected $assoc;
-
/**
* Display the view
*/
View
6 administrator/language/en-GB/en-GB.com_tags.ini
@@ -37,7 +37,6 @@ COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_LABEL="Default Tagged Items Layout"
COM_TAGS_CONFIGURATION="Tags Configuration"
COM_TAGS_DELETE_NOT_ALLOWED="Delete not allowed for tag %s. "
COM_TAGS_DESCRIPTION_DESC="Enter an optional tag description in the text-area."
-COM_TAGS_ERROR_ALL_LANGUAGE_ASSOCIATED="A tag item set to All languages can't be associated. Associations have not been set."
COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag has the same alias"
COM_TAGS_EXCLUDE="Exclude"
COM_TAGS_FIELD_CONFIG_HITS_DESC="Displays the number of hits"
@@ -84,9 +83,6 @@ COM_TAGS_HAS_SUBCATEGORY_ITEMS_1="%d item is assigned to one of this tag's subta
COM_TAGS_INCLUDE="Include"
COM_TAGS_INCLUDE_CHILDREN_DESC="Include or exclude child tags from the result list for a tag"
COM_TAGS_INCLUDE_CHILDREN_LABEL="Child Tags"
-COM_TAGS_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilanguage only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a category item for the target language. This association will let the Language Switcher module redirect to the associated category item in another language. If used, make sure to display the Language switcher module on the concerned pages. A category item set to language 'All' can't be associated."
-COM_TAGS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Tag Item Associations"
-COM_TAGS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -"
COM_TAGS_ITEM_OPTIONS="Item Options"
COM_TAGS_ITEMS_SEARCH_FILTER="Search"
COM_TAGS_LEFT="Left"
@@ -168,8 +164,6 @@ COM_TAGS_TAGGED_ITEMS_DATE="Date"
COM_TAGS_TAGGED_ITEMS_ID="ID"
COM_TAGS_TAGGED_ITEMS_LANGUAGE="Language"
COM_TAGS_TAGGED_ITEMS_TITLE="Title"
-COM_TAGS_TIP_ASSOCIATED_LANGUAGE="%s %s"
-COM_TAGS_TIP_ASSOCIATION="Associated tag items"
COM_TAGS_XML_DESCRIPTION="This component manages tags"
JGLOBAL_NO_ITEM_SELECTED="No tags selected"
JLIB_DATABASE_ERROR_ANCESTOR_NODES_LOWER_STATE="Cannot change the published state when the parent tag is of a lesser state."
View
3 installation/CHANGELOG
@@ -25,6 +25,9 @@ $ -> Language fix or change
- -> Removed
! -> Note3
+07-Apr-2013 Jean-Marie Simonet
+ # [#30226] *TAGS: Getting rid of all aspects concerning lang associations
+
06-Apr-2013 Mark Dexter
# [#30453] Tags: Pagination not working when linking to a tag.
# [#30486] *Banners Manager:Banners and Banners Manager:Clients Status filter issue. Thanks Jean-Marie Simonet.

0 comments on commit 3dee52d

Please sign in to comment.
Something went wrong with that request. Please try again.