Skip to content

Commit 87f2467

Browse files
Add tag functionality for Joomla 3.10
1 parent 6b819c0 commit 87f2467

File tree

7 files changed

+34
-15
lines changed

7 files changed

+34
-15
lines changed

administrator/components/com_jtg/tables/jtg_cats.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class TableJTG_Cats extends JTable
5656
public function __construct(& $db)
5757
{
5858
parent::__construct('#__jtg_cats', 'id', $db);
59-
$this->typeAlias = 'com_jtg.category';
6059
}
6160

6261
/**

administrator/components/com_jtg/tables/jtg_files.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ class TableJTG_Files extends Table implements TaggableTableInterface
8989
public function __construct(& $db)
9090
{
9191
parent::__construct('#__jtg_files', 'id', $db);
92-
$this->typeAlias = 'com_jtg.file';
92+
if (version_compare(JVERSION,'4.0','ge')) {
93+
$this->typeAlias = 'com_jtg.file';
94+
}
95+
else {
96+
JObserverMapper::addObserverClassToClass('JTableObserverContenthistory', 'TableJTG_Files', array('typeAlias' => 'com_jtg.file'));
97+
JTableObserverTags::createObserver($this, array('typeAlias' => 'com_jtg.file'));
98+
}
9399
}
94100

95101
function getTypeAlias() { return 'com_jtg.file'; }

administrator/components/com_jtg/views/files/tmpl/import.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
JToolBarHelper::deleteList('COM_JTG_VALIDATE_DELETE_ITEMS', 'removeFromImport');
3737
JToolBarHelper::help('files/import', true);
3838
$document = JFactory::getDocument();
39-
$style = " #row00 {--table-bg: #FFFF99;}\n";
39+
$style = " #row00 {--table-bg: #FFFF99; background-color: #FFFF99;}\n";
4040
$style .= " .table-admin {--table-bg: var(--admin-background);}\n";
4141

4242
if (version_compare(JVERSION, '3.0', 'ge'))
@@ -124,7 +124,12 @@ class="adminForm" enctype="multipart/form-data">
124124
// . JText::_('COM_JTG_PRESELECTION_DESCRIPTION') . "</td>
125125
$trackForm = $this->getModel()->getForm();
126126
$tagField = $trackForm->getField('tags');
127-
$tagField->__set('onchange',"setSelectTags('tags')");
127+
if (version_compare(JVERSION, '4.0', 'ge')) {
128+
$tagField->__set('onchange',"setSelectTags('tags')");
129+
}
130+
else {
131+
$tagField->__set('onchange',"setSelectMultiple('tags')");
132+
}
128133
$tagField->__set('name',"tags_all");
129134
$tagField->__set('id',"tags_all");
130135
$table = (" <tbody>\n

administrator/components/com_jtg/views/files/view.html.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,13 @@ protected function _displayForm($tpl)
694694
$lists['published'] = JHtml::_('select.booleanlist', 'published', null, $track->published);
695695
$lists['values'] = JtgHelper::giveGeneratedValues('backend', $this->buildImageFiletypes($track->istrack, $track->iswp, $track->isroute, $track->iscache), $track);
696696
$lists['level'] = $model->getLevelList($track->level);
697-
$this->tagids = $model->getTable('jtg_files')->getTagsHelper()->getTagIds($id, 'com_jtg.file');
697+
if (version_compare(JVERSION,'4.0','ge')) {
698+
$this->tagids = $model->getTable('jtg_files')->getTagsHelper()->getTagIds($id, 'com_jtg.file');
699+
}
700+
else {
701+
$tagsHelper = new JHelperTags;
702+
$this->tagids = $tagsHelper->getTagIds($id, 'com_jtg.file');
703+
}
698704
$trackForm = $this->getModel()->getForm();
699705
$tagField = $trackForm->getField('tags');
700706
$tagField->setValue($this->tagids);

com_jtg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<extension type="component" version="4.0" method="upgrade">
2+
<extension type="component" version="3.10" method="upgrade">
33
<name>com_jtg</name>
44
<author>J!Track Gallery, InJoo0SM and joomGPStracks teams</author>
55
<creationDate>22.04.2011</creationDate>

components/com_jtg/models/track.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
jimport('joomla.application.component.model');
2121
use Joomla\CMS\Factory;
2222
use Joomla\CMS\Editor\Editor;
23-
use Joomla\CMS\MVC\Model\ItemModel;
24-
use Joomla\CMS\MVC\Model\FormBehaviorTrait;
23+
use Joomla\CMS\MVC\Model\FormModel;
2524
use Joomla\CMS\HTML\HTMLHelper;
26-
use Joomla\CMS\Form\FormFactoryAwareTrait;
2725

2826
/**
2927
* JtgModelTrack class for the jtg component
@@ -34,10 +32,8 @@
3432
*/
3533

3634

37-
class JtgModelTrack extends ItemModel
35+
class JtgModelTrack extends FormModel
3836
{
39-
use FormFactoryAwareTrait;
40-
use FormBehaviorTrait;
4137

4238
public function getForm($data = array(), $loadData = true)
4339
{

components/com_jtg/views/track/view.html.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function display($tpl = null)
156156
jimport('joomla.filesystem.folder');
157157

158158
// Code support for joomla version greater than 3.0
159-
if (JVERSION >= 3.0)
159+
if (version_compare(JVERSION,'3.0','ge'))
160160
{
161161
JHtml::_('jquery.framework');
162162
JHtml::script(Juri::base() . 'components/com_jtg/assets/js/jquery.MultiFile.js');
@@ -232,8 +232,15 @@ public function display($tpl = null)
232232
$this->elevationDataExists = $gpsData->elevationDataExists;
233233
$this->beatDataExists = $gpsData->beatDataExists;
234234

235-
$this->tags = $model->getTable('jtg_files')->getTagsHelper()->getItemTags('com_jtg.file' , $this->id);
236-
$this->tagids = $model->getTable('jtg_files')->getTagsHelper()->getTagIds($this->id, 'com_jtg.file');
235+
if (version_compare(JVERSION,'4.0','ge')) {
236+
$this->tags = $model->getTable('jtg_files')->getTagsHelper()->getItemTags('com_jtg.file' , $this->id);
237+
$this->tagids = $model->getTable('jtg_files')->getTagsHelper()->getTagIds($this->id, 'com_jtg.file');
238+
}
239+
else {
240+
$tagsHelper = new JHelperTags;
241+
$this->tags = $tagsHelper->getItemTags('com_jtg.file' , $this->id);
242+
$this->tagids = $tagsHelper->getTagIds($this->id, 'com_jtg.file');
243+
}
237244

238245
if ( count($this->imageList) > 0) {
239246
$this->images = true;

0 commit comments

Comments
 (0)