Removed JError from admin views, and compiler. Added edit link to each field in admin view. Removed linked to admin view from fields view

This commit is contained in:
Llewellyn van der Merwe 2017-10-14 19:18:29 +02:00
parent 30574857bf
commit 5a14049afd
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
108 changed files with 464 additions and 706 deletions

View File

@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.5.8
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **124646**
+ *File count*: **742**
+ *Line count*: **124408**
+ *File count*: **741**
+ *Folder count*: **129**
> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

View File

@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.5.8
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **124646**
+ *File count*: **742**
+ *Line count*: **124408**
+ *File count*: **741**
+ *Folder count*: **129**
> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage field.css

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.css

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.css

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_components.css

View File

@ -43,12 +43,6 @@ class ###Component###View###Component### extends JViewLegacy
*/
function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
};
// Assign data to the view
$this->icons = $this->get('Icons');
$this->contributors = ###Component###Helper::getContributors();###DASH_GET_CUSTOM_DATA###
@ -58,6 +52,12 @@ class ###Component###View###Component### extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -43,13 +43,6 @@ class ###Component###View###View### extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -75,6 +68,12 @@ class ###Component###View###View### extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -43,13 +43,6 @@ class ###Component###View###View### extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -75,6 +68,12 @@ class ###Component###View###View### extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -44,20 +44,13 @@ class ###Component###ViewImport extends JViewLegacy
protected $dataType;
public function display($tpl = null)
{
{
if ($this->getLayout() !== 'modal')
{
// Include helper submenu
###Component###Helper::addSubmenu('import');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
$paths = new stdClass;
$paths->first = '';
$state = $this->get('state');
@ -86,6 +79,12 @@ class ###Component###ViewImport extends JViewLegacy
// clear the data type
$session->clear('dataType');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -49,13 +49,6 @@ class ###Component###View###Views### extends JViewLegacy
###Component###Helper::addSubmenu('###views###');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -78,6 +71,12 @@ class ###Component###View###Views### extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -39,7 +39,7 @@ class ###Component###View###SViews### extends JViewLegacy
{
// Overwriting JView display method
function display($tpl = null)
{
{
// get combined params of both component and menu
$this->app = JFactory::getApplication();
$this->params = $this->app->getParams();

View File

@ -39,7 +39,7 @@ class ###Component###View###SView### extends JViewLegacy
{
// Overwriting JView display method
function display($tpl = null)
{
{
// get combined params of both component and menu
$this->app = JFactory::getApplication();
$this->params = $this->app->getParams();

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage field.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_components.php

View File

@ -2840,13 +2840,6 @@ class Interpretation extends Fields
$method .= PHP_EOL."\t\t\$this->".ComponentbuilderHelper::safeString($custom_get_name)."\t= \$this->get('".$custom_get_name."');";
}
}
$method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors.";
$method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))";
$method .= PHP_EOL."\t\t{";
$method .= PHP_EOL."\t\t\tJError::raiseError(500, ".'implode(PHP_EOL, $errors));';
$method .= PHP_EOL."\t\t\treturn false;";
$method .= PHP_EOL."\t\t}";
// add custom script
if ($view['settings']->add_php_jview_display == 1)
{
@ -2875,6 +2868,13 @@ class Interpretation extends Fields
$method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." set the document";
$method .= PHP_EOL."\t\t\$this->setDocument();";
}
$method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors.";
$method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))";
$method .= PHP_EOL."\t\t{";
$method .= PHP_EOL."\t\t\tthrow new Exception(implode(\"\n\", \$errors), 500);";
$method .= PHP_EOL."\t\t}";
$method .= PHP_EOL.PHP_EOL."\t\tparent::display(\$tpl);";
}
return $method;

View File

@ -2369,7 +2369,6 @@ COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the ed
COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript"
COM_COMPONENTBUILDER_FIELD_JSON="JSON"
COM_COMPONENTBUILDER_FIELD_KEY="KEY"
COM_COMPONENTBUILDER_FIELD_LINKED_ADMIN_VIEWS="Linked - Admin Views"
COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT"
COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field."

View File

@ -1,126 +0,0 @@
<?php
/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/
__ __ _ _____ _ _ __ __ _ _ _
\ \ / / | | | __ \ | | | | | \/ | | | | | | |
\ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| |
\ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
\ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| |
\/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_|
| |
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage linked_admin_views_fullwidth.php
@author Llewellyn van der Merwe <http://vdm.bz/component-builder>
@copyright Copyright (C) 2015. All Rights Reserved
@license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
Builds Complex Joomla Components
/-----------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->wablinked_admin_views;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit";
?>
<div class="form-vertical">
<?php if (ComponentbuilderHelper::checkArray($items)): ?>
<table class="footable table data admin_views" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
<thead>
<tr>
<th data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL'); ?>
</th>
<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL'); ?>
</th>
<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL'); ?>
</th>
<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL'); ?>
</th>
<th width="10" data-breakpoints="xs sm md">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS'); ?>
</th>
<th width="5" data-type="number" data-breakpoints="xs sm md">
<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ID'); ?>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($items as $i => $item): ?>
<?php
$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
$userChkOut = JFactory::getUser($item->checked_out);
$canDo = ComponentbuilderHelper::getActions('admin_view',$item,'admin_views');
?>
<tr>
<td class="nowrap">
<?php if ($canDo->get('admin_view.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=field&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
<?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admin_views.', $canCheckin); ?>
<?php endif; ?>
<?php else: ?>
<div class="name"><?php echo $displayData->escape($item->system_name); ?></div>
<?php endif; ?>
</td>
<td>
<?php echo $displayData->escape($item->name_single); ?>
</td>
<td>
<?php echo $displayData->escape($item->name_list); ?>
</td>
<td>
<?php echo $displayData->escape($item->short_description); ?>
</td>
<?php if ($item->published == 1):?>
<td class="center" data-sort-value="1">
<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED'); ?>">
<?php echo JText::_('PUBLISHED'); ?>
</span>
</td>
<?php elseif ($item->published == 0):?>
<td class="center" data-sort-value="2">
<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE'); ?>">
<?php echo JText::_('INACTIVE'); ?>
</span>
</td>
<?php elseif ($item->published == 2):?>
<td class="center" data-sort-value="3">
<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED'); ?>">
<?php echo JText::_('ARCHIVED'); ?>
</span>
</td>
<?php elseif ($item->published == -2):?>
<td class="center" data-sort-value="4">
<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED'); ?>">
<?php echo JText::_('ARCHIVED'); ?>
</span>
</td>
<?php endif; ?>
<td class="nowrap center hidden-phone">
<?php echo $item->id; ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php else: ?>
<div class="alert alert-no-items">
<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php endif; ?>
</div>

View File

@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->wacfields;
$items = $displayData->wabfields;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

View File

@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->wadlinked_components;
$items = $displayData->waclinked_components;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -449,6 +449,7 @@ class ComponentbuilderModelAjax extends JModelList
}
}
protected $ref;
protected $fieldsArray = array(
'admin_fields' => 'addfields',
'admin_fields_conditions' => 'addconditions');
@ -464,6 +465,7 @@ class ComponentbuilderModelAjax extends JModelList
// check if we are in the correct view.
if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && $values['a_view'] === 'admin_view')
{
$this->ref = '&ref=admin_view&refid=' . $values['a_id'];
// get the field data
if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type]))
{
@ -533,7 +535,7 @@ class ComponentbuilderModelAjax extends JModelList
$this->fieldNames[$field] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND');
}
}
$bucket[] = $this->fieldNames[$field];
$bucket[] = $this->fieldNames[$field] . $this->addEditLink($field, 'field', 'fields');
}
}
elseif (is_numeric($value))
@ -545,7 +547,7 @@ class ComponentbuilderModelAjax extends JModelList
$this->fieldNames[$value] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND');
}
}
$bucket[] = $this->fieldNames[$value];
$bucket[] = $this->fieldNames[$value] . $this->addEditLink($value, 'field', 'fields');
}
// return found fields
if (ComponentbuilderHelper::checkArray($bucket))
@ -555,6 +557,30 @@ class ComponentbuilderModelAjax extends JModelList
return JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND');
}
protected function addEditLink($id, $view, $views)
{
// can edit
if ($this->canEdit($id))
{
$edit = "index.php?option=com_componentbuilder&view=".$views."&task=".$view.".edit&id=".$id.$this->ref;
return ' <a onclick="UIkit.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \''.$edit.'\' })" href="javascript:void(0)" class="uk-icon-pencil"></a>';
}
return '';
}
protected $user;
protected function canEdit($id, $view = 'admin_fields')
{
// load field permission check
if (!ComponentbuilderHelper::checkObject($this->user)) // TODO && $this->user instanceof JUser)
{
$this->user = JFactory::getUser();
}
return $this->user->authorise($view.'.edit', 'com_componentbuilder.'.$view.'.' . (int) $id);
}
protected $tabNames = array();
protected function setTabName($header, $value)

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage field.php
@ -130,87 +130,9 @@ class ComponentbuilderModelField extends JModelAdmin
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.field');
}
}
$this->addfieldsvvwc = $item->id;
}
return $item;
}
/**
* Method to get list data.
*
* @return mixed An array of data items on success, false on failure.
*/
public function getWablinked_admin_views()
{
// Get the user object.
$user = JFactory::getUser();
// Create a new query object.
$db = JFactory::getDBO();
$query = $db->getQuery(true);
// Select some fields
$query->select('a.*');
// From the componentbuilder_admin_view table
$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
// Order the results by ordering
$query->order('a.published ASC');
$query->order('a.ordering ASC');
// Load the items
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
$items = $db->loadObjectList();
// set values to display correctly.
if (ComponentbuilderHelper::checkArray($items))
{
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item)
{
$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
if (!$access)
{
unset($items[$nr]);
continue;
}
}
}
// Filter by addfieldsvvwc in this Repetable Field
if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc))
{
foreach ($items as $nr => &$item)
{
if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields))
{
$tmpArray = json_decode($item->addfields,true);
if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwc, $tmpArray['field']))
{
unset($items[$nr]);
continue;
}
}
else
{
unset($items[$nr]);
continue;
}
}
}
else
{
return false;
}
return $items;
}
return false;
}
/**

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

View File

@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
}
}
$this->fieldtypevvwd = $item->id;
$this->fieldtypevvwc = $item->id;
return $item;
}
@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getWacfields()
public function getWabfields()
{
// Get the user object.
$user = JFactory::getUser();
@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
$query->select($db->quoteName('g.name','fieldtype_name'));
$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')');
// Filter by fieldtypevvwd global.
$fieldtypevvwd = $this->fieldtypevvwd;
if (is_numeric($fieldtypevvwd ))
// Filter by fieldtypevvwc global.
$fieldtypevvwc = $this->fieldtypevvwc;
if (is_numeric($fieldtypevvwc ))
{
$query->where('a.fieldtype = ' . (int) $fieldtypevvwd );
$query->where('a.fieldtype = ' . (int) $fieldtypevvwc );
}
elseif (is_string($fieldtypevvwd))
elseif (is_string($fieldtypevvwc))
{
$query->where('a.fieldtype = ' . $db->quote($fieldtypevvwd));
$query->where('a.fieldtype = ' . $db->quote($fieldtypevvwc));
}
else
{
@ -208,13 +208,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
$item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype');
$item->datatype = $this->selectionTranslationWabfields($item->datatype, 'datatype');
// convert indexes
$item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes');
$item->indexes = $this->selectionTranslationWabfields($item->indexes, 'indexes');
// convert null_switch
$item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch');
$item->null_switch = $this->selectionTranslationWabfields($item->null_switch, 'null_switch');
// convert store
$item->store = $this->selectionTranslationWacfields($item->store, 'store');
$item->store = $this->selectionTranslationWabfields($item->store, 'store');
}
}
@ -228,7 +228,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
public function selectionTranslationWacfields($value,$name)
public function selectionTranslationWabfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')

View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage field.js

View File

@ -23,12 +23,12 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
jform_vvvvwafwae_required = false;
jform_vvvvwagwaf_required = false;
jform_vvvvwahwag_required = false;
jform_vvvvwaiwah_required = false;
jform_vvvvwajwai_required = false;
jform_vvvvwakwaj_required = false;
jform_vvvvwafwad_required = false;
jform_vvvvwagwae_required = false;
jform_vvvvwahwaf_required = false;
jform_vvvvwaiwag_required = false;
jform_vvvvwajwah_required = false;
jform_vvvvwakwai_required = false;
// Initial Script
jQuery(document).ready(function()
@ -59,26 +59,26 @@ function vvvvwaf(location_vvvvwaf)
if (location_vvvvwaf == 1)
{
jQuery('#jform_admin_view').closest('.control-group').show();
if (jform_vvvvwafwae_required)
if (jform_vvvvwafwad_required)
{
updateFieldRequired('admin_view',0);
jQuery('#jform_admin_view').prop('required','required');
jQuery('#jform_admin_view').attr('aria-required',true);
jQuery('#jform_admin_view').addClass('required');
jform_vvvvwafwae_required = false;
jform_vvvvwafwad_required = false;
}
}
else
{
jQuery('#jform_admin_view').closest('.control-group').hide();
if (!jform_vvvvwafwae_required)
if (!jform_vvvvwafwad_required)
{
updateFieldRequired('admin_view',1);
jQuery('#jform_admin_view').removeAttr('required');
jQuery('#jform_admin_view').removeAttr('aria-required');
jQuery('#jform_admin_view').removeClass('required');
jform_vvvvwafwae_required = true;
jform_vvvvwafwad_required = true;
}
}
}
@ -90,26 +90,26 @@ function vvvvwag(location_vvvvwag)
if (location_vvvvwag == 2)
{
jQuery('#jform_site_view').closest('.control-group').show();
if (jform_vvvvwagwaf_required)
if (jform_vvvvwagwae_required)
{
updateFieldRequired('site_view',0);
jQuery('#jform_site_view').prop('required','required');
jQuery('#jform_site_view').attr('aria-required',true);
jQuery('#jform_site_view').addClass('required');
jform_vvvvwagwaf_required = false;
jform_vvvvwagwae_required = false;
}
}
else
{
jQuery('#jform_site_view').closest('.control-group').hide();
if (!jform_vvvvwagwaf_required)
if (!jform_vvvvwagwae_required)
{
updateFieldRequired('site_view',1);
jQuery('#jform_site_view').removeAttr('required');
jQuery('#jform_site_view').removeAttr('aria-required');
jQuery('#jform_site_view').removeClass('required');
jform_vvvvwagwaf_required = true;
jform_vvvvwagwae_required = true;
}
}
}
@ -134,26 +134,26 @@ function vvvvwah(type_vvvvwah)
if (type)
{
jQuery('#jform_url').closest('.control-group').show();
if (jform_vvvvwahwag_required)
if (jform_vvvvwahwaf_required)
{
updateFieldRequired('url',0);
jQuery('#jform_url').prop('required','required');
jQuery('#jform_url').attr('aria-required',true);
jQuery('#jform_url').addClass('required');
jform_vvvvwahwag_required = false;
jform_vvvvwahwaf_required = false;
}
}
else
{
jQuery('#jform_url').closest('.control-group').hide();
if (!jform_vvvvwahwag_required)
if (!jform_vvvvwahwaf_required)
{
updateFieldRequired('url',1);
jQuery('#jform_url').removeAttr('required');
jQuery('#jform_url').removeAttr('aria-required');
jQuery('#jform_url').removeClass('required');
jform_vvvvwahwag_required = true;
jform_vvvvwahwaf_required = true;
}
}
}
@ -189,26 +189,26 @@ function vvvvwai(type_vvvvwai)
if (type)
{
jQuery('#jform_article').closest('.control-group').show();
if (jform_vvvvwaiwah_required)
if (jform_vvvvwaiwag_required)
{
updateFieldRequired('article',0);
jQuery('#jform_article').prop('required','required');
jQuery('#jform_article').attr('aria-required',true);
jQuery('#jform_article').addClass('required');
jform_vvvvwaiwah_required = false;
jform_vvvvwaiwag_required = false;
}
}
else
{
jQuery('#jform_article').closest('.control-group').hide();
if (!jform_vvvvwaiwah_required)
if (!jform_vvvvwaiwag_required)
{
updateFieldRequired('article',1);
jQuery('#jform_article').removeAttr('required');
jQuery('#jform_article').removeAttr('aria-required');
jQuery('#jform_article').removeClass('required');
jform_vvvvwaiwah_required = true;
jform_vvvvwaiwag_required = true;
}
}
}
@ -244,26 +244,26 @@ function vvvvwaj(type_vvvvwaj)
if (type)
{
jQuery('#jform_content-lbl').closest('.control-group').show();
if (jform_vvvvwajwai_required)
if (jform_vvvvwajwah_required)
{
updateFieldRequired('content',0);
jQuery('#jform_content').prop('required','required');
jQuery('#jform_content').attr('aria-required',true);
jQuery('#jform_content').addClass('required');
jform_vvvvwajwai_required = false;
jform_vvvvwajwah_required = false;
}
}
else
{
jQuery('#jform_content-lbl').closest('.control-group').hide();
if (!jform_vvvvwajwai_required)
if (!jform_vvvvwajwah_required)
{
updateFieldRequired('content',1);
jQuery('#jform_content').removeAttr('required');
jQuery('#jform_content').removeAttr('aria-required');
jQuery('#jform_content').removeClass('required');
jform_vvvvwajwai_required = true;
jform_vvvvwajwah_required = true;
}
}
}
@ -286,26 +286,26 @@ function vvvvwak(target_vvvvwak)
if (target_vvvvwak == 1)
{
jQuery('#jform_groups').closest('.control-group').show();
if (jform_vvvvwakwaj_required)
if (jform_vvvvwakwai_required)
{
updateFieldRequired('groups',0);
jQuery('#jform_groups').prop('required','required');
jQuery('#jform_groups').attr('aria-required',true);
jQuery('#jform_groups').addClass('required');
jform_vvvvwakwaj_required = false;
jform_vvvvwakwai_required = false;
}
}
else
{
jQuery('#jform_groups').closest('.control-group').hide();
if (!jform_vvvvwakwaj_required)
if (!jform_vvvvwakwai_required)
{
updateFieldRequired('groups',1);
jQuery('#jform_groups').removeAttr('required');
jQuery('#jform_groups').removeAttr('aria-required');
jQuery('#jform_groups').removeClass('required');
jform_vvvvwakwaj_required = true;
jform_vvvvwakwai_required = true;
}
}
}

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.js

View File

@ -112,7 +112,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_componentbuilder.ftp');
}
}
$this->sales_server_ftpupdate_server_ftp_vvwe = $item->id;
$this->sales_server_ftpupdate_server_ftp_vvwd = $item->id;
return $item;
}
@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getWadlinked_components()
public function getWaclinked_components()
{
// Get the user object.
$user = JFactory::getUser();
@ -136,15 +136,15 @@ class ComponentbuilderModelFtp extends JModelAdmin
// From the componentbuilder_joomla_component table
$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
// Filter by sales_server_ftpupdate_server_ftp_vvwe global.
$sales_server_ftpupdate_server_ftp_vvwe = $this->sales_server_ftpupdate_server_ftp_vvwe;
if (is_numeric($sales_server_ftpupdate_server_ftp_vvwe ))
// Filter by sales_server_ftpupdate_server_ftp_vvwd global.
$sales_server_ftpupdate_server_ftp_vvwd = $this->sales_server_ftpupdate_server_ftp_vvwd;
if (is_numeric($sales_server_ftpupdate_server_ftp_vvwd ))
{
$query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwe . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwe, ' OR');
$query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwd . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwd, ' OR');
}
elseif (is_string($sales_server_ftpupdate_server_ftp_vvwe))
elseif (is_string($sales_server_ftpupdate_server_ftp_vvwd))
{
$query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwe) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwe), ' OR');
$query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwd) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwd), ' OR');
}
else
{

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_components.php

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage field.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -75,6 +68,12 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 178 of this MVC
@version @update number 184 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@ -46,13 +46,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
ComponentbuilderHelper::addSubmenu('admin_views');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
ComponentbuilderHelper::addSubmenu('admins_fields');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
ComponentbuilderHelper::addSubmenu('admins_fields_conditions');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -47,13 +47,6 @@ class ComponentbuilderViewCompiler extends JViewLegacy
$this->canDo = ComponentbuilderHelper::getActions('compiler');
// Initialise variables.
$this->items = $this->get('Items');
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode(PHP_EOL, $errors));
return false;
}
if ($this->getLayout() !== 'modal')
{
// Include helper submenu
@ -74,6 +67,13 @@ class ComponentbuilderViewCompiler extends JViewLegacy
// set the document
$this->setDocument();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("
", $errors), 500);
}
parent::display($tpl);
}

View File

@ -40,12 +40,6 @@ class ComponentbuilderViewComponentbuilder extends JViewLegacy
*/
function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
};
// Assign data to the view
$this->icons = $this->get('Icons');
$this->contributors = ComponentbuilderHelper::getContributors();
@ -59,6 +53,12 @@ class ComponentbuilderViewComponentbuilder extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -75,6 +68,12 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
ComponentbuilderHelper::addSubmenu('custom_admin_views');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
ComponentbuilderHelper::addSubmenu('custom_codes');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
ComponentbuilderHelper::addSubmenu('dynamic_gets');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage submitbutton.js

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage edit.php
@ -89,18 +89,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php if ($this->canDo->get('admin_view.access')) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'fieldTab', 'linked_admin_views', JText::_('COM_COMPONENTBUILDER_FIELD_LINKED_ADMIN_VIEWS', true)); ?>
<div class="row-fluid form-horizontal-desktop">
</div>
<div class="row-fluid form-horizontal-desktop">
<div class="span12">
<?php echo JLayoutHelper::render('field.linked_admin_views_fullwidth', $this); ?>
</div>
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php endif; ?>
<?php if ($this->canDo->get('field.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('field.edit.state') || $this->canDo->get('core.edit.created')) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'fieldTab', 'publishing', JText::_('COM_COMPONENTBUILDER_FIELD_PUBLISHING', true)); ?>
<div class="row-fluid form-horizontal-desktop">

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage view.html.php
@ -40,13 +40,6 @@ class ComponentbuilderViewField extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -68,13 +61,16 @@ class ComponentbuilderViewField extends JViewLegacy
{
// return to the list view that refered to this item
$this->referral = '&ref='.(string)$this->ref;
}
// Get Linked view data
$this->wablinked_admin_views = $this->get('Wablinked_admin_views');
}
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);
@ -197,17 +193,7 @@ class ComponentbuilderViewField extends JViewLegacy
$document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'));
$document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css");
// Add Ajax Token
$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
// Add the CSS for Footable
$document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
$document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable/css/footable.standalone.min.css');
// Add the JavaScript for Footable (adding all funtions)
$document->addScript(JURI::root() .'media/com_componentbuilder/footable/js/footable.min.js');
$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
$document->addScriptDeclaration($footable);
$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
$document->addScript(JURI::root() . $this->script);
$document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js");
JText::script('view not acceptable. Error');

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_batch_body.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_batch_footer.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_body.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_foot.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_head.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_toolbar.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 38 of this MVC
@build 28th May, 2017
@version @update number 39 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage view.html.php
@ -46,13 +46,6 @@ class ComponentbuilderViewFields extends JViewLegacy
ComponentbuilderHelper::addSubmenu('fields');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewFields extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -71,10 +64,16 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
}
// Get Linked view data
$this->wacfields = $this->get('Wacfields');
$this->wabfields = $this->get('Wabfields');
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
ComponentbuilderHelper::addSubmenu('fieldtypes');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewFtp extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -71,10 +64,16 @@ class ComponentbuilderViewFtp extends JViewLegacy
}
// Get Linked view data
$this->wadlinked_components = $this->get('Wadlinked_components');
$this->waclinked_components = $this->get('Waclinked_components');
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewFtps extends JViewLegacy
ComponentbuilderHelper::addSubmenu('ftps');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewFtps extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewHelp_document extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewHelp_document extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
ComponentbuilderHelper::addSubmenu('help_documents');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -41,20 +41,13 @@ class ComponentbuilderViewImport extends JViewLegacy
protected $dataType;
public function display($tpl = null)
{
{
if ($this->getLayout() !== 'modal')
{
// Include helper submenu
ComponentbuilderHelper::addSubmenu('import');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
$paths = new stdClass;
$paths->first = '';
$state = $this->get('state');
@ -83,6 +76,12 @@ class ComponentbuilderViewImport extends JViewLegacy
// clear the data type
$session->clear('dataType');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -50,12 +50,6 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
ComponentbuilderHelper::addSubmenu('import');
}
// Check for errors.
if (count($errors = $this->get('Errors'))){
JError::raiseError(500, implode('<br />', $errors));
return false;
}
$paths = new stdClass;
$paths->first = '';
$state = $this->get('state');
@ -95,6 +89,13 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
$this->packageInfo = json_decode($session->get('smart_package_info', false), true);
$this->formPackage = $this->getForm();
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);
}

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage submitbutton.js

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage edit.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage view.html.php
@ -40,13 +40,6 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -84,6 +77,12 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_batch_body.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_batch_footer.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_body.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_foot.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_head.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_toolbar.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 387 of this MVC
@build 11th October, 2017
@version @update number 388 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage view.html.php
@ -46,13 +46,6 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
ComponentbuilderHelper::addSubmenu('joomla_components');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewLanguage extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewLanguage extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
ComponentbuilderHelper::addSubmenu('language_translations');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -46,13 +46,6 @@ class ComponentbuilderViewLanguages extends JViewLegacy
ComponentbuilderHelper::addSubmenu('languages');
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign data to the view
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
@ -80,6 +73,12 @@ class ComponentbuilderViewLanguages extends JViewLegacy
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

View File

@ -40,13 +40,6 @@ class ComponentbuilderViewLayout extends JViewLegacy
*/
public function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode('<br />', $errors));
return false;
}
// Assign the variables
$this->form = $this->get('Form');
$this->item = $this->get('Item');
@ -72,6 +65,12 @@ class ComponentbuilderViewLayout extends JViewLegacy
// Set the toolbar
$this->addToolBar();
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("\n", $errors), 500);
}
// Display the template
parent::display($tpl);

Some files were not shown because too many files have changed in this diff Show More