32
1
mirror of https://github.com/joomla-extensions/weblinks.git synced 2025-01-27 22:38:28 +00:00
This commit is contained in:
Tuan Pham Ngoc 2021-06-26 17:13:37 +07:00
parent a39c5f6b12
commit f9d7f8625b
9 changed files with 132 additions and 123 deletions

View File

@ -153,7 +153,8 @@ class Com_WeblinksInstallerScript
. $db->quote('com_weblinks.weblink') . ', ' . $db->quote('com_weblinks.weblink') . ', '
. $db->quote( . $db->quote(
'{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"}, '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},
"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}'
) . ', '
. $db->quote('') . ', ' . $db->quote('') . ', '
. $db->quote( . $db->quote(
'{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias", '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias",
@ -161,7 +162,8 @@ class Com_WeblinksInstallerScript
"core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params",
"core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url",
"core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc",
"core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}') . ', ' "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}'
) . ', '
. $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', ' . $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', '
. $db->quote( . $db->quote(
'{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml", '{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml",
@ -170,7 +172,8 @@ class Com_WeblinksInstallerScript
"ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},
{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},
{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},
{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}') {"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'
)
); );
$db->setQuery($query); $db->setQuery($query);
@ -189,7 +192,8 @@ class Com_WeblinksInstallerScript
. $db->quote('com_weblinks.category') . ', ' . $db->quote('com_weblinks.category') . ', '
. $db->quote(' . $db->quote('
{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"}, {"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},
"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}'
) . ', '
. $db->quote('') . ', ' . $db->quote('') . ', '
. $db->quote(' . $db->quote('
{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias", {"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias",
@ -198,7 +202,8 @@ class Com_WeblinksInstallerScript
"core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language",
"core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey",
"core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"},
"special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', ' "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}'
) . ', '
. $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', ' . $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', '
. $db->quote(' . $db->quote('
{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", {"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",
@ -209,7 +214,8 @@ class Com_WeblinksInstallerScript
"displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id", "displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id",
"displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id", "displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id",
"displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id", "displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id",
"displayColumn":"title"}]}') "displayColumn":"title"}]}'
)
); );
$db->setQuery($query); $db->setQuery($query);

View File

@ -111,6 +111,7 @@ class WeblinkField extends FormField
->from($db->quoteName('#__weblinks')) ->from($db->quoteName('#__weblinks'))
->where($db->quoteName('id') . ' = ' . (int) $value); ->where($db->quoteName('id') . ' = ' . (int) $value);
$db->setQuery($query); $db->setQuery($query);
try try
{ {
$title = $db->loadResult(); $title = $db->loadResult();
@ -265,6 +266,7 @@ class WeblinkField extends FormField
) )
); );
} }
// Note: class='required' for client side validation. // Note: class='required' for client side validation.
$class = $this->required ? ' class="required modal-value"' : ''; $class = $this->required ? ' class="required modal-value"' : '';
$html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name $html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name

View File

@ -30,6 +30,7 @@ defined('_JEXEC') or die;
class WeblinkTable extends Table implements VersionableTableInterface, TaggableTableInterface class WeblinkTable extends Table implements VersionableTableInterface, TaggableTableInterface
{ {
use TaggableTableTrait; use TaggableTableTrait;
/** /**
* Ensure the params and metadata in json encoded in the bind method * Ensure the params and metadata in json encoded in the bind method
* *

View File

@ -100,7 +100,7 @@ class CategoryModel extends ListModel
} }
// Get the tags // Get the tags
$item->tags = new TagsHelper(); $item->tags = new TagsHelper;
$item->tags->getItemTags('com_weblinks.weblink', $item->id); $item->tags->getItemTags('com_weblinks.weblink', $item->id);
} }

View File

@ -57,7 +57,7 @@ class HtmlView extends CategoryView
$temp = new Registry; $temp = new Registry;
$temp->loadString($item->params); $temp->loadString($item->params);
$item->params = clone($this->params); $item->params = clone $this->params;
$item->params->merge($temp); $item->params->merge($temp);
} }
@ -71,11 +71,11 @@ class HtmlView extends CategoryView
*/ */
protected function prepareDocument() protected function prepareDocument()
{ {
parent::prepareDocument();; parent::prepareDocument();
;
parent::addFeed(); parent::addFeed();
if ($this->menuItemMatchCategory) if ($this->menuItemMatchCategory)
{ {
// If the active menu item is linked directly to the category being displayed, no further process is needed // If the active menu item is linked directly to the category being displayed, no further process is needed

View File

@ -141,7 +141,7 @@ class PlgFinderWeblinks extends Adapter
public function onFinderAfterSave($context, $row, $isNew) public function onFinderAfterSave($context, $row, $isNew)
{ {
// We only want to handle web links here. We need to handle front end and back end editing. // We only want to handle web links here. We need to handle front end and back end editing.
if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form' ) if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form')
{ {
// Check if the access levels are different. // Check if the access levels are different.
if (!$isNew && $this->old_access != $row->access) if (!$isNew && $this->old_access != $row->access)