joomla
/
weblinks
mirror of https://github.com/joomla-extensions/weblinks.git
30
1
Fork 0
Code Issues Releases Activity

Set default value for fields (fix frontend submit weblink error)

This commit is contained in:
Tuan Pham Ngoc 2021-06-26 14:12:43 +07:00
parent 6c68bcad5d
commit 15466baa0f
2 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/administrator/components/com_weblinks/src/Table/WeblinkTable.php
View File

@ -11,6 +11,8 @@ namespace Joomla\Component\Weblinks\Administrator\Table;
use Joomla\CMS\Application\ApplicationHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Filter\InputFilter;
use Joomla\CMS\Language\Text;
use Joomla\CMS\String\PunycodeHelper;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Tag\TaggableTableInterface;
@ -65,7 +67,7 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
public function store($updateNulls = false)
{
$date = Factory::getDate();
$user = Factory::getUser();
$user = Factory::getApplication()->getIdentity();
$this->modified = $date->toSql();
@ -107,7 +109,7 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid))
&& ($table->id != $this->id || $this->id == 0))
{
$this->setError(\JText::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS'));
$this->setError(Text::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS'));
return false;
}
@ -115,12 +117,6 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
// Convert IDN urls to punycode
$this->url = PunycodeHelper::urlToPunycode($this->url);
// Set default value for xreference
if ($this->xreference === null)
{
$this->xreference = '';
}
return parent::store($updateNulls);
}
@ -133,9 +129,9 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
*/
public function check()
{
if (\JFilterInput::checkAttribute(array('href', $this->url)))
if (InputFilter::checkAttribute(array('href', $this->url)))
{
$this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL'));
$this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL'));
return false;
}
@ -143,7 +139,7 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
// Check for valid name
if (trim($this->title) == '')
{
$this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_TITLE'));
$this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_TITLE'));
return false;
}
@ -163,7 +159,7 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
if ($xid && $xid != (int) $this->id)
{
$this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_NAME'));
$this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_NAME'));
return false;
}
@ -183,7 +179,7 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
// Check the publish down date is not earlier than publish up.
if ($this->publish_down > $db->getNullDate() && $this->publish_down < $this->publish_up)
{
$this->setError(\JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
$this->setError(Text::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
return false;
}
@ -213,6 +209,43 @@ class WeblinkTable extends Table implements VersionableTableInterface, TaggableT
$this->metakey = implode(", ", $clean_keys);
}
/**
* Ensure any new items have compulsory fields set. This is needed for things like
* frontend editing where we don't show all the fields or using some kind of API
*/
if (!$this->id)
{
if (!isset($this->xreference))
{
$this->xreference = '';
}
if (!isset($this->metakey))
{
$this->metakey = '';
}
if (!isset($this->metadesc))
{
$this->metadesc = '';
}
if (!isset($this->images))
{
$this->images = '{}';
}
if (!isset($this->metadata))
{
$this->metadata = '{}';
}
if (!isset($this->params))
{
$this->params = '{}';
}
}
return parent::check();
}

2
src/administrator/components/com_weblinks/tmpl/weblinks/modal.php
View File

@ -41,7 +41,7 @@ $onclick = $this->escape($function);
if (!empty($editor))
{
// This view is used also in com_menus. Load the xtd script only if the editor is set!
$app->getDocument()->addScriptOptions('xtd-weblinks', array('editor' => $editor));
$this->document->addScriptOptions('xtd-weblinks', array('editor' => $editor));
$onclick = "jSelectWeblink";
}