joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests 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

2
admin/models/admin_view.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

2
admin/models/admin_views.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

30
admin/models/ajax.php
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)

84
admin/models/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 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;
}
/**

4
admin/models/fields.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

26
admin/models/fieldtype.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')

2
admin/models/forms/admin_view.js
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

4
admin/models/forms/field.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 field.js

60
admin/models/forms/help_document.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;
}
}
}

4
admin/models/forms/joomla_component.js
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

16
admin/models/ftp.php
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
{

4
admin/models/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_component.php

4
admin/models/joomla_components.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