joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

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

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-14 19:18:29 +02:00
parent 30574857bf
commit 5a14049afd
108 changed files with 464 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/views/field/submitbutton.js
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

16
admin/views/field/tmpl/edit.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 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">

34
admin/views/field/view.html.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
@@ -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');