From 018eed3054450e196b667fc1da4b5db932d7a421 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 29 Jan 2019 16:43:27 +0200 Subject: [PATCH] Resolved gh-370 so that all fields get loaded in a dynamicGet, even new once created at a later stage. --- README.md | 12 +- admin/README.txt | 12 +- admin/helpers/compiler/a_Get.php | 72 +- admin/helpers/componentbuilder.php | 168 +++ .../en-GB/en-GB.com_componentbuilder.ini | 3 + admin/layouts/dynamic_get/main_left.php | 3 +- admin/models/ajax.php | 195 +-- admin/models/forms/custom_code.js | 78 +- admin/models/forms/dynamic_get.js | 1340 +++++++++-------- admin/models/forms/dynamic_get.xml | 364 ++--- admin/models/forms/field.js | 398 ++--- admin/models/forms/help_document.js | 246 +-- admin/models/forms/library.js | 188 +-- admin/models/forms/server.js | 580 +++---- admin/sql/install.mysql.utf8.sql | 12 +- admin/sql/updates/mysql/2.9.9.sql | 1 + admin/views/custom_code/tmpl/edit.php | 114 +- admin/views/dynamic_get/tmpl/edit.php | 322 ++-- admin/views/field/tmpl/edit.php | 132 +- admin/views/help_document/tmpl/edit.php | 54 +- admin/views/library/tmpl/edit.php | 40 +- admin/views/server/tmpl/edit.php | 156 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 19 +- script.php | 10 +- site/helpers/componentbuilder.php | 168 +++ 26 files changed, 2547 insertions(+), 2146 deletions(-) create mode 100644 admin/sql/updates/mysql/2.9.9.sql diff --git a/README.md b/README.md index 516a2ee07..d55007778 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.9) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.10) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 26th January, 2019 -+ *Version*: 2.9.9 ++ *Last Build*: 29th January, 2019 ++ *Version*: 2.9.10 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **194678** -+ *Field count*: **1088** -+ *File count*: **1276** ++ *Line count*: **195039** ++ *Field count*: **1089** ++ *File count*: **1277** + *Folder count*: **201** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 516a2ee07..d55007778 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.9) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.10) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 26th January, 2019 -+ *Version*: 2.9.9 ++ *Last Build*: 29th January, 2019 ++ *Version*: 2.9.10 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **194678** -+ *Field count*: **1088** -+ *File count*: **1276** ++ *Line count*: **195039** ++ *Field count*: **1089** ++ *File count*: **1277** + *Folder count*: **201** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 01474202e..5e31b3e46 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -3008,16 +3008,26 @@ class Get switch ($result->main_source) { case 1: + // check if auto sync is set + if ($result->select_all == 1) + { + $result->view_selection = '*'; + } // set the view data - $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->view_selection, $result->view_table_main, 'a', '', 'view'); + $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->view_selection, $result->view_table_main, 'a', null, 'view'); $result->main_get[0]['as'] = 'a'; $result->main_get[0]['key'] = $result->key; $result->main_get[0]['context'] = $context; unset($result->view_selection); break; case 2: + // check if auto sync is set + if ($result->select_all == 1) + { + $result->db_selection = '*'; + } // set the database data - $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->db_selection, $result->db_table_main, 'a', '', 'db'); + $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->db_selection, $result->db_table_main, 'a', null, 'db'); $result->main_get[0]['as'] = 'a'; $result->main_get[0]['key'] = $result->key; $result->main_get[0]['context'] = $context; @@ -4199,21 +4209,42 @@ class Get { if (ComponentbuilderHelper::checkString($string)) { - $lines = explode(PHP_EOL, $string); + if ('db' === $type) + { + $table = '#__' . $asset; + $queryName = $asset; + $view = ''; + } + elseif ('view' === $type) + { + $view = $this->getViewTableName($asset); + $table = '#__' . $this->componentCodeName . '_' . $view; + $queryName = $view; + } + // just get all values from table if * is found + if ($string === '*' || strpos($string, '*') !== false) + { + if ($type == 'view') + { + $_string = ComponentbuilderHelper::getViewTableColumns($asset, $as, $row_type); + } + else + { + $_string = ComponentbuilderHelper::getDbTableColumns($asset, $as, $row_type); + } + // get only selected values + $lines = explode(PHP_EOL, $_string); + // make sure to set the string to * + $string = '*'; + } + else + { + // get only selected values + $lines = explode(PHP_EOL, $string); + } + // only continue if lines are available if (ComponentbuilderHelper::checkArray($lines)) { - if ('db' === $type) - { - $table = '#__' . $asset; - $queryName = $asset; - $view = ''; - } - elseif ('view' === $type) - { - $view = $this->getViewTableName($asset); - $table = '#__' . $this->componentCodeName . '_' . $view; - $queryName = $view; - } $gets = array(); $keys = array(); // first load all options @@ -4272,7 +4303,16 @@ class Get } if (ComponentbuilderHelper::checkArray($gets) && ComponentbuilderHelper::checkArray($keys)) { - $querySelect = '$query->select($db->quoteName(' . PHP_EOL . $this->_t(3) . 'array(' . implode(',', $gets) . '),' . PHP_EOL . $this->_t(3) . 'array(' . implode(',', $keys) . ')));'; + // single joined selection needs the prefix to the values to avoid conflict in the names + // so we most still add then AS + if ($string == '*' && 1 != $row_type) + { + $querySelect = "\$query->select('" . $as . ".*');"; + } + else + { + $querySelect = '$query->select($db->quoteName(' . PHP_EOL . $this->_t(3) . 'array(' . implode(',', $gets) . '),' . PHP_EOL . $this->_t(3) . 'array(' . implode(',', $keys) . ')));'; + } $queryFrom = '$db->quoteName(' . $this->db->quote($table) . ', ' . $this->db->quote($as) . ')'; // return the select query return array('select' => $querySelect, 'from' => $queryFrom, 'name' => $queryName, 'table' => $table, 'type' => $type, 'select_gets' => $gets, 'select_keys' => $keys); diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 5d740ada3..7421ad656 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -1011,6 +1011,174 @@ abstract class ComponentbuilderHelper return '
'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'
'; } + /** + * get the database table columns + **/ + public static function getDbTableColumns($tableName, $as, $type) + { + // Get a db connection. + $db = JFactory::getDbo(); + // get the columns + $columns = $db->getTableColumns("#__" . $tableName); + // set the type (multi or single) + $unique = ''; + if (1 == $type) + { + $unique = self::safeString($tableName) . '_'; + } + if (self::checkArray($columns)) + { + // build the return string + $tableColumns = array(); + foreach ($columns as $column => $typeCast) + { + $tableColumns[] = $as . "." . $column . ' AS ' . $unique . $column; + } + return implode("\n", $tableColumns); + } + return false; + } + + /** + * get the view table columns + **/ + public static function getViewTableColumns($admin_view, $as, $type) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.addfields', 'b.name_single'))); + $query->from($db->quoteName('#__componentbuilder_admin_fields', 'a')); + $query->join('LEFT', $db->quoteName('#__componentbuilder_admin_view', 'b') . ' ON (' . $db->quoteName('a.admin_view') . ' = ' . $db->quoteName('b.id') . ')'); + $query->where($db->quoteName('b.published') . ' = 1'); + $query->where($db->quoteName('a.admin_view') . ' = ' . (int) $admin_view); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $result = $db->loadObject(); + $tableName = ''; + if (1 == $type) + { + $tableName = self::safeString($result->name_single) . '_'; + } + $addfields = json_decode($result->addfields, true); + if (self::checkArray($addfields)) + { + // reset all buckets + $field = array(); + $fields = array(); + // get data + foreach ($addfields as $nr => $value) + { + $tmp = self::getFieldNameAndType((int) $value['field']); + if (self::checkArray($tmp)) + { + $field[$nr] = $tmp; + } + // insure it is set to alias if needed + if (isset($value['alias']) && $value['alias'] == 1) + { + $field[$nr]['name'] = 'alias'; + } + // remove a field that is not being stored in the database + if (!isset($value['list']) || $value['list'] == 2) + { + unset($field[$nr]); + } + } + // add the basic defaults + $fields[] = $as . ".id AS " . $tableName . "id"; + $fields[] = $as . ".asset_id AS " . $tableName . "asset_id"; + // load data + foreach ($field as $n => $f) + { + if (self::checkArray($f)) + { + $fields[] = $as . "." . $f['name'] . " AS " . $tableName . $f['name']; + } + } + // add the basic defaults + $fields[] = $as . ".published AS " . $tableName . "published"; + $fields[] = $as . ".created_by AS " . $tableName . "created_by"; + $fields[] = $as . ".modified_by AS " . $tableName . "modified_by"; + $fields[] = $as . ".created AS " . $tableName . "created"; + $fields[] = $as . ".modified AS " . $tableName . "modified"; + $fields[] = $as . ".version AS " . $tableName . "version"; + $fields[] = $as . ".hits AS " . $tableName . "hits"; + if (0) // TODO access is not set here but per/view in the form linking this admin view to which these field belong to the components (boooo I know but that is the case and so we can't ever really know at this point if this view has access set) + { + $fields[] = $as . ".access AS " . $tableName . "access"; + } + $fields[] = $as . ".ordering AS " . $tableName . "ordering"; + // return the field of this view + return implode("\n", $fields); + } + } + return false; + } + + protected static function getFieldNameAndType($id) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Order it by the ordering field. + $query->select($db->quoteName(array('a.name', 'a.xml'))); + $query->select($db->quoteName(array('c.name'), array('type_name'))); + $query->from('#__componentbuilder_field AS a'); + $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('c.id') . ')'); + $query->where($db->quoteName('a.id') . ' = '. $db->quote($id)); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + // Load the results as a list of stdClass objects (see later for more options on retrieving data). + $field = $db->loadObject(); + // load the values form params + $field->xml = json_decode($field->xml); + $field->type_name = self::safeString($field->type_name); + $load = true; + // if category then name must be catid (only one per view) + if ($field->type_name == 'category') + { + $name = 'catid'; + } + // if tag is set then enable all tag options for this view (only one per view) + elseif ($field->type_name == 'tag') + { + $name = 'tags'; + } + // don't add spacers or notes + elseif ($field->type_name == 'spacer' || $field->type_name == 'note') + { + // make sure the name is unique + return false; + } + else + { + $name = self::safeString(self::getBetween($field->xml,'name="','"')); + } + + // use field core name only if not found in xml + if (!self::checkString($name)) + { + $name = self::safeString($field->name);; + } + return array('name' => $name, 'type' => $field->type_name); + } + return false; + } + /** * The array of dynamic content * diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 584b5e691..9dd6c7536 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4073,6 +4073,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_SAVE_WARNING="Alias already existed so a number COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION="Fields to be selected from table." COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT="b.field AS field" COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL="Selection" +COM_COMPONENTBUILDER_DYNAMIC_GET_SELECT_ALL="Select All" +COM_COMPONENTBUILDER_DYNAMIC_GET_SELECT_ALL_DESCRIPTION="Should all the fields be selected, even those newly added at a later stage." +COM_COMPONENTBUILDER_DYNAMIC_GET_SELECT_ALL_LABEL="Select All" COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE="Single" COM_COMPONENTBUILDER_DYNAMIC_GET_SS="ss" COM_COMPONENTBUILDER_DYNAMIC_GET_STATE="State" diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index cf12600d5..202899d72 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -17,8 +17,9 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'main_source', 'view_table_main', - 'view_selection', 'db_table_main', + 'select_all', + 'view_selection', 'db_selection' ); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 030b35111..c43f0cfa1 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -1593,173 +1593,26 @@ class ComponentbuilderModelAjax extends JModelList // Used in dynamic_get public function getViewTableColumns($admin_view, $as, $type) { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('a.addfields', 'b.name_single'))); - $query->from($db->quoteName('#__componentbuilder_admin_fields', 'a')); - $query->join('LEFT', $db->quoteName('#__componentbuilder_admin_view', 'b') . ' ON (' . $db->quoteName('a.admin_view') . ' = ' . $db->quoteName('b.id') . ')'); - $query->where($db->quoteName('b.published') . ' = 1'); - $query->where($db->quoteName('a.admin_view') . ' = '. (int) $admin_view); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $result = $db->loadObject(); - $description = ''; - $tableName = ''; - if (1 == $type) - { - $tableName = ComponentbuilderHelper::safeString($result->name_single).'_'; - } - $addfields = json_decode($result->addfields,true); - if (ComponentbuilderHelper::checkArray($addfields)) - { - $fields = array(); - // get data - foreach ($addfields as $nr => $value) - { - $tmp = $this->getFieldData((int) $value['field']); - if (ComponentbuilderHelper::checkArray($tmp)) - { - $field[$nr] = $tmp; - } - // insure it is set to alias if needed - if (isset($value['alias']) && $value['alias'] == 1) - { - $field[$nr]['name'] = 'alias'; - } - } - // add the basic defaults - $fields[] = $as.".id AS ".$tableName."id"; - $fields[] = $as.".asset_id AS ".$tableName."asset_id"; - // load data - foreach ($field as $n => $f) - { - if (ComponentbuilderHelper::checkArray($f)) - { - $fields[] = $as.".".$f['name']." AS ".$tableName.$f['name']; - } - } - // add the basic defaults - $fields[] = $as.".published AS ".$tableName."published"; - $fields[] = $as.".created_by AS ".$tableName."created_by"; - $fields[] = $as.".modified_by AS ".$tableName."modified_by"; - $fields[] = $as.".created AS ".$tableName."created"; - $fields[] = $as.".modified AS ".$tableName."modified"; - $fields[] = $as.".version AS ".$tableName."version"; - $fields[] = $as.".hits AS ".$tableName."hits"; - if (0) - { - $fields[] = $as.".access AS ".$tableName."access"; - } - $fields[] = $as.".ordering AS ".$tableName."ordering"; - $viewFields = $description.implode("\n",$fields); - } - return $viewFields; - } - return false; + return ComponentbuilderHelper::getViewTableColumns($admin_view, $as, $type); } - protected function getFieldData($id) - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Order it by the ordering field. - $query->select($db->quoteName(array('a.name','a.xml'))); - $query->select($db->quoteName(array('c.name'),array('type_name'))); - $query->from('#__componentbuilder_field AS a'); - $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('c.id') . ')'); - $query->where($db->quoteName('a.id') . ' = '. $db->quote($id)); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - // Load the results as a list of stdClass objects (see later for more options on retrieving data). - $field = $db->loadObject(); - // load the values form params - $field->xml = json_decode($field->xml); - $field->type_name = ComponentbuilderHelper::safeString($field->type_name); - $load = true; - // if category then name must be catid (only one per view) - if ($field->type_name == 'category') - { - $name = 'catid'; - - } - // if tag is set then enable all tag options for this view (only one per view) - elseif ($field->type_name == 'tag') - { - $name = 'tags'; - } - // don't add spacers or notes - elseif ($field->type_name == 'spacer' || $field->type_name == 'note') - { - // make sure the name is unique - return false; - } - else - { - $name = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field->xml,'name="','"')); - } - - // use field core name only if not found in xml - if (!ComponentbuilderHelper::checkString($name)) - { - $name = ComponentbuilderHelper::safeString($field->name);; - } - return array('name' => $name, 'type' => $field->type_name); - } - return false; - } - public function getDbTableColumns($tableName, $as, $type) { - // Get a db connection. - $db = JFactory::getDbo(); - // get the columns - $columns = $db->getTableColumns("#__".$tableName); - // set the type (multi or single) - $unique = ''; - if (1 == $type) - { - $unique = ComponentbuilderHelper::safeString($tableName).'_'; - } - if (ComponentbuilderHelper::checkArray($columns)) - { - // build the return string - $tableColumns = array(); - foreach ($columns as $column => $typeCast) - { - $tableColumns[] = $as.".".$column . ' AS ' . $unique . $column; - } - return implode("\n",$tableColumns); - } - return false; + return ComponentbuilderHelper::getDbTableColumns($tableName, $as, $type); } public function getDynamicValues($id, $view) { // Get a db connection. $db = JFactory::getDbo(); - + // Create a new query object. $query = $db->getQuery(true); - $query->select($db->quoteName(array('getcustom', 'gettype', 'main_source', 'view_selection', 'db_selection', 'join_view_table', 'join_db_table', 'addcalculation', 'php_calculation'))); + $query->select($db->quoteName(array('getcustom', 'gettype', 'select_all', 'db_table_main', 'view_table_main', 'main_source', 'view_selection', 'db_selection', 'join_view_table', 'join_db_table', 'addcalculation', 'php_calculation'))); $query->from($db->quoteName('#__componentbuilder_dynamic_get')); $query->where($db->quoteName('published') . ' = 1'); - $query->where($db->quoteName('id') . ' = '. (int) $id); - + $query->where($db->quoteName('id') . ' = ' . (int) $id); + // Reset the query using our newly populated query object. $db->setQuery($query); $db->execute(); @@ -1772,11 +1625,19 @@ class ComponentbuilderModelAjax extends JModelList // get the main values (name) if ($result->main_source == 1) { - $selections[] = explode("\n",$result->view_selection); + if ($result->select_all == 1) + { + $result->view_selection = ComponentbuilderHelper::getViewTableColumns($result->view_table_main, 'a', $result->gettype); + } + $selections[] = explode("\n", $result->view_selection); } elseif ($result->main_source == 2) { - $selections[] = explode("\n",$result->db_selection); + if ($result->select_all == 1) + { + $result->db_selection = ComponentbuilderHelper::getDbTableColumns($result->db_table_main, 'a', $result->gettype); + } + $selections[] = explode("\n", $result->db_selection); } elseif ($result->main_source == 3) { @@ -1798,14 +1659,20 @@ class ComponentbuilderModelAjax extends JModelList { foreach ($result->join_view_table as $join_view_table) { + // check if all is selected + if (strpos($join_view_table['selection'], '*') !== false) + { + $join_view_table['selection'] = ComponentbuilderHelper::getViewTableColumns($join_view_table['view_table'], $join_view_table['as'], $join_view_table['row_type']); + } + // build selection if ($join_view_table['row_type'] == '1') { - $selections[] = explode("\n",$join_view_table['selection']); + $selections[] = explode("\n", $join_view_table['selection']); } elseif ($join_view_table['row_type'] == '2') { $names = $this->setListMethodName(array($join_view_table['on_field'],$join_view_table['join_field']),$join_view_table['view_table'],$join_view_table['as'],1); - $selectionsList[implode('',$names)] = explode("\n",$join_view_table['selection']); + $selectionsList[implode('',$names)] = explode("\n", $join_view_table['selection']); } } unset($result->join_view_table); @@ -1814,14 +1681,20 @@ class ComponentbuilderModelAjax extends JModelList { foreach ($result->join_db_table as $join_db_table) { + // check if all is selected + if (strpos($join_db_table['selection'], '*') !== false) + { + $join_db_table['selection'] = ComponentbuilderHelper::getViewTableColumns($join_db_table['view_table'], $join_db_table['as'], $join_db_table['row_type']); + } + // build selections if ($join_db_table['row_type'] == '1') { - $selections[] = explode("\n",$join_db_table['selection']); + $selections[] = explode("\n", $join_db_table['selection']); } elseif ($join_db_table['row_type'] == '2') { $names = $this->setListMethodName(array($join_db_table['on_field'],$join_db_table['join_field']),$join_db_table['db_table'],$join_db_table['as'],2); - $selectionsList[implode('',$names)] = explode("\n",$join_db_table['selection']); + $selectionsList[implode('',$names)] = explode("\n", $join_db_table['selection']); } } unset($result->join_db_table); @@ -1946,7 +1819,7 @@ class ComponentbuilderModelAjax extends JModelList } return false; } - + protected function setListMethodName($names, $table, $as, $type) { $methodNames = array(); @@ -1991,7 +1864,7 @@ class ComponentbuilderModelAjax extends JModelList $methodNames[] = ComponentbuilderHelper::safeString($as,'U'); return $methodNames; } - + protected function getViewName($id) { // Get the view name diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index 9fa679cea..d2332e6b7 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -9,44 +9,44 @@ */ // Some Global Values -jform_vvvvwadvzr_required = false; -jform_vvvvwaevzs_required = false; -jform_vvvvwaevzt_required = false; -jform_vvvvwaevzu_required = false; +jform_vvvvwaevzr_required = false; +jform_vvvvwafvzs_required = false; +jform_vvvvwafvzt_required = false; +jform_vvvvwafvzu_required = false; // Initial Script jQuery(document).ready(function() { - var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvwad(target_vvvvwad); - var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val(); vvvvwae(target_vvvvwae); var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val(); - var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val(); - vvvvwaf(target_vvvvwaf,type_vvvvwaf); + vvvvwaf(target_vvvvwaf); - var type_vvvvwag = jQuery("#jform_type input[type='radio']:checked").val(); var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvwag(type_vvvvwag,target_vvvvwag); + var type_vvvvwag = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvwag(target_vvvvwag,type_vvvvwag); + + var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val(); + var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvwah(type_vvvvwah,target_vvvvwah); }); -// the vvvvwad function -function vvvvwad(target_vvvvwad) +// the vvvvwae function +function vvvvwae(target_vvvvwae) { // set the function logic - if (target_vvvvwad == 2) + if (target_vvvvwae == 2) { jQuery('#jform_function_name').closest('.control-group').show(); // add required attribute to function_name field - if (jform_vvvvwadvzr_required) + if (jform_vvvvwaevzr_required) { updateFieldRequired('function_name',0); jQuery('#jform_function_name').prop('required','required'); jQuery('#jform_function_name').attr('aria-required',true); jQuery('#jform_function_name').addClass('required'); - jform_vvvvwadvzr_required = false; + jform_vvvvwaevzr_required = false; } jQuery('.note_jcb_placeholder').closest('.control-group').show(); jQuery('#jform_system_name').closest('.control-group').show(); @@ -55,102 +55,102 @@ function vvvvwad(target_vvvvwad) { jQuery('#jform_function_name').closest('.control-group').hide(); // remove required attribute from function_name field - if (!jform_vvvvwadvzr_required) + if (!jform_vvvvwaevzr_required) { updateFieldRequired('function_name',1); jQuery('#jform_function_name').removeAttr('required'); jQuery('#jform_function_name').removeAttr('aria-required'); jQuery('#jform_function_name').removeClass('required'); - jform_vvvvwadvzr_required = true; + jform_vvvvwaevzr_required = true; } jQuery('.note_jcb_placeholder').closest('.control-group').hide(); jQuery('#jform_system_name').closest('.control-group').hide(); } } -// the vvvvwae function -function vvvvwae(target_vvvvwae) +// the vvvvwaf function +function vvvvwaf(target_vvvvwaf) { // set the function logic - if (target_vvvvwae == 1) + if (target_vvvvwaf == 1) { jQuery('#jform_component').closest('.control-group').show(); // add required attribute to component field - if (jform_vvvvwaevzs_required) + if (jform_vvvvwafvzs_required) { updateFieldRequired('component',0); jQuery('#jform_component').prop('required','required'); jQuery('#jform_component').attr('aria-required',true); jQuery('#jform_component').addClass('required'); - jform_vvvvwaevzs_required = false; + jform_vvvvwafvzs_required = false; } jQuery('#jform_path').closest('.control-group').show(); // add required attribute to path field - if (jform_vvvvwaevzt_required) + if (jform_vvvvwafvzt_required) { updateFieldRequired('path',0); jQuery('#jform_path').prop('required','required'); jQuery('#jform_path').attr('aria-required',true); jQuery('#jform_path').addClass('required'); - jform_vvvvwaevzt_required = false; + jform_vvvvwafvzt_required = false; } jQuery('#jform_from_line').closest('.control-group').show(); jQuery('#jform_hashtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); jQuery('#jform_type').closest('.control-group').show(); // add required attribute to type field - if (jform_vvvvwaevzu_required) + if (jform_vvvvwafvzu_required) { updateFieldRequired('type',0); jQuery('#jform_type').prop('required','required'); jQuery('#jform_type').attr('aria-required',true); jQuery('#jform_type').addClass('required'); - jform_vvvvwaevzu_required = false; + jform_vvvvwafvzu_required = false; } } else { jQuery('#jform_component').closest('.control-group').hide(); // remove required attribute from component field - if (!jform_vvvvwaevzs_required) + if (!jform_vvvvwafvzs_required) { updateFieldRequired('component',1); jQuery('#jform_component').removeAttr('required'); jQuery('#jform_component').removeAttr('aria-required'); jQuery('#jform_component').removeClass('required'); - jform_vvvvwaevzs_required = true; + jform_vvvvwafvzs_required = true; } jQuery('#jform_path').closest('.control-group').hide(); // remove required attribute from path field - if (!jform_vvvvwaevzt_required) + if (!jform_vvvvwafvzt_required) { updateFieldRequired('path',1); jQuery('#jform_path').removeAttr('required'); jQuery('#jform_path').removeAttr('aria-required'); jQuery('#jform_path').removeClass('required'); - jform_vvvvwaevzt_required = true; + jform_vvvvwafvzt_required = true; } jQuery('#jform_from_line').closest('.control-group').hide(); jQuery('#jform_hashtarget').closest('.control-group').hide(); jQuery('#jform_to_line').closest('.control-group').hide(); jQuery('#jform_type').closest('.control-group').hide(); // remove required attribute from type field - if (!jform_vvvvwaevzu_required) + if (!jform_vvvvwafvzu_required) { updateFieldRequired('type',1); jQuery('#jform_type').removeAttr('required'); jQuery('#jform_type').removeAttr('aria-required'); jQuery('#jform_type').removeClass('required'); - jform_vvvvwaevzu_required = true; + jform_vvvvwafvzu_required = true; } } } -// the vvvvwaf function -function vvvvwaf(target_vvvvwaf,type_vvvvwaf) +// the vvvvwag function +function vvvvwag(target_vvvvwag,type_vvvvwag) { // set the function logic - if (target_vvvvwaf == 1 && type_vvvvwaf == 1) + if (target_vvvvwag == 1 && type_vvvvwag == 1) { jQuery('#jform_hashendtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); @@ -162,11 +162,11 @@ function vvvvwaf(target_vvvvwaf,type_vvvvwaf) } } -// the vvvvwag function -function vvvvwag(type_vvvvwag,target_vvvvwag) +// the vvvvwah function +function vvvvwah(type_vvvvwah,target_vvvvwah) { // set the function logic - if (type_vvvvwag == 1 && target_vvvvwag == 1) + if (type_vvvvwah == 1 && target_vvvvwah == 1) { jQuery('#jform_hashendtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index af8576f38..e7a704b6d 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -10,25 +10,25 @@ // Some Global Values jform_vvvvvzdvyx_required = false; -jform_vvvvvzevyy_required = false; -jform_vvvvvzfvyz_required = false; -jform_vvvvvzgvza_required = false; -jform_vvvvvzhvzb_required = false; -jform_vvvvvzivzc_required = false; -jform_vvvvvznvzd_required = false; -jform_vvvvvzpvze_required = false; -jform_vvvvvzqvzf_required = false; -jform_vvvvvzsvzg_required = false; -jform_vvvvvzsvzh_required = false; -jform_vvvvvztvzi_required = false; -jform_vvvvvzuvzj_required = false; -jform_vvvvvzvvzk_required = false; -jform_vvvvvzxvzl_required = false; -jform_vvvvvzxvzm_required = false; -jform_vvvvvzxvzn_required = false; -jform_vvvvvzyvzo_required = false; -jform_vvvvvzzvzp_required = false; -jform_vvvvwaavzq_required = false; +jform_vvvvvzfvyy_required = false; +jform_vvvvvzgvyz_required = false; +jform_vvvvvzhvza_required = false; +jform_vvvvvzivzb_required = false; +jform_vvvvvzjvzc_required = false; +jform_vvvvvzovzd_required = false; +jform_vvvvvzqvze_required = false; +jform_vvvvvzrvzf_required = false; +jform_vvvvvztvzg_required = false; +jform_vvvvvztvzh_required = false; +jform_vvvvvzuvzi_required = false; +jform_vvvvvzvvzj_required = false; +jform_vvvvvzwvzk_required = false; +jform_vvvvvzyvzl_required = false; +jform_vvvvvzyvzm_required = false; +jform_vvvvvzyvzn_required = false; +jform_vvvvvzzvzo_required = false; +jform_vvvvwaavzp_required = false; +jform_vvvvwabvzq_required = false; // Initial Script jQuery(document).ready(function() @@ -48,48 +48,48 @@ jQuery(document).ready(function() var main_source_vvvvvzh = jQuery("#jform_main_source").val(); vvvvvzh(main_source_vvvvvzh); - var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - vvvvvzi(addcalculation_vvvvvzi); + var main_source_vvvvvzi = jQuery("#jform_main_source").val(); + vvvvvzi(main_source_vvvvvzi); var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - var gettype_vvvvvzj = jQuery("#jform_gettype").val(); - vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj); + vvvvvzj(addcalculation_vvvvvzj); var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val(); var gettype_vvvvvzk = jQuery("#jform_gettype").val(); vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk); - var main_source_vvvvvzn = jQuery("#jform_main_source").val(); - vvvvvzn(main_source_vvvvvzn); + var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val(); + var gettype_vvvvvzl = jQuery("#jform_gettype").val(); + vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl); var main_source_vvvvvzo = jQuery("#jform_main_source").val(); vvvvvzo(main_source_vvvvvzo); - var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); - var gettype_vvvvvzp = jQuery("#jform_gettype").val(); - vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp); + var main_source_vvvvvzp = jQuery("#jform_main_source").val(); + vvvvvzp(main_source_vvvvvzp); - var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var add_php_before_getitem_vvvvvzq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); var gettype_vvvvvzq = jQuery("#jform_gettype").val(); - vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq); + vvvvvzq(add_php_before_getitem_vvvvvzq,gettype_vvvvvzq); - var gettype_vvvvvzs = jQuery("#jform_gettype").val(); - vvvvvzs(gettype_vvvvvzs); + var add_php_after_getitem_vvvvvzr = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var gettype_vvvvvzr = jQuery("#jform_gettype").val(); + vvvvvzr(add_php_after_getitem_vvvvvzr,gettype_vvvvvzr); - var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzt = jQuery("#jform_gettype").val(); - vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt); + vvvvvzt(gettype_vvvvvzt); - var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); + var add_php_getlistquery_vvvvvzu = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzu = jQuery("#jform_gettype").val(); - vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu); + vvvvvzu(add_php_getlistquery_vvvvvzu,gettype_vvvvvzu); - var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var add_php_before_getitems_vvvvvzv = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); var gettype_vvvvvzv = jQuery("#jform_gettype").val(); - vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv); + vvvvvzv(add_php_before_getitems_vvvvvzv,gettype_vvvvvzv); - var gettype_vvvvvzx = jQuery("#jform_gettype").val(); - vvvvvzx(gettype_vvvvvzx); + var add_php_after_getitems_vvvvvzw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var gettype_vvvvvzw = jQuery("#jform_gettype").val(); + vvvvvzw(add_php_after_getitems_vvvvvzw,gettype_vvvvvzw); var gettype_vvvvvzy = jQuery("#jform_gettype").val(); vvvvvzy(gettype_vvvvvzy); @@ -98,11 +98,14 @@ jQuery(document).ready(function() vvvvvzz(gettype_vvvvvzz); var gettype_vvvvwaa = jQuery("#jform_gettype").val(); - var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val(); - vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa); + vvvvwaa(gettype_vvvvwaa); - var gettype_vvvvwac = jQuery("#jform_gettype").val(); - vvvvwac(gettype_vvvvwac); + var gettype_vvvvwab = jQuery("#jform_gettype").val(); + var add_php_router_parse_vvvvwab = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val(); + vvvvwab(gettype_vvvvwab,add_php_router_parse_vvvvwab); + + var gettype_vvvvwad = jQuery("#jform_gettype").val(); + vvvvwad(gettype_vvvvwad); }); // the vvvvvzd function @@ -180,29 +183,11 @@ function vvvvvze(main_source_vvvvvze) // set this function logic if (main_source) { - jQuery('#jform_view_table_main').closest('.control-group').show(); - // add required attribute to view_table_main field - if (jform_vvvvvzevyy_required) - { - updateFieldRequired('view_table_main',0); - jQuery('#jform_view_table_main').prop('required','required'); - jQuery('#jform_view_table_main').attr('aria-required',true); - jQuery('#jform_view_table_main').addClass('required'); - jform_vvvvvzevyy_required = false; - } + jQuery('#jform_select_all').closest('.control-group').show(); } else { - jQuery('#jform_view_table_main').closest('.control-group').hide(); - // remove required attribute from view_table_main field - if (!jform_vvvvvzevyy_required) - { - updateFieldRequired('view_table_main',1); - jQuery('#jform_view_table_main').removeAttr('required'); - jQuery('#jform_view_table_main').removeAttr('aria-required'); - jQuery('#jform_view_table_main').removeClass('required'); - jform_vvvvvzevyy_required = true; - } + jQuery('#jform_select_all').closest('.control-group').hide(); } } @@ -210,7 +195,7 @@ function vvvvvze(main_source_vvvvvze) function main_source_vvvvvze_SomeFunc(main_source_vvvvvze) { // set the function logic - if (main_source_vvvvvze == 1) + if (main_source_vvvvvze == 1 || main_source_vvvvvze == 2) { return true; } @@ -236,28 +221,28 @@ function vvvvvzf(main_source_vvvvvzf) // set this function logic if (main_source) { - jQuery('#jform_view_selection').closest('.control-group').show(); - // add required attribute to view_selection field - if (jform_vvvvvzfvyz_required) + jQuery('#jform_view_table_main').closest('.control-group').show(); + // add required attribute to view_table_main field + if (jform_vvvvvzfvyy_required) { - updateFieldRequired('view_selection',0); - jQuery('#jform_view_selection').prop('required','required'); - jQuery('#jform_view_selection').attr('aria-required',true); - jQuery('#jform_view_selection').addClass('required'); - jform_vvvvvzfvyz_required = false; + updateFieldRequired('view_table_main',0); + jQuery('#jform_view_table_main').prop('required','required'); + jQuery('#jform_view_table_main').attr('aria-required',true); + jQuery('#jform_view_table_main').addClass('required'); + jform_vvvvvzfvyy_required = false; } } else { - jQuery('#jform_view_selection').closest('.control-group').hide(); - // remove required attribute from view_selection field - if (!jform_vvvvvzfvyz_required) + jQuery('#jform_view_table_main').closest('.control-group').hide(); + // remove required attribute from view_table_main field + if (!jform_vvvvvzfvyy_required) { - updateFieldRequired('view_selection',1); - jQuery('#jform_view_selection').removeAttr('required'); - jQuery('#jform_view_selection').removeAttr('aria-required'); - jQuery('#jform_view_selection').removeClass('required'); - jform_vvvvvzfvyz_required = true; + updateFieldRequired('view_table_main',1); + jQuery('#jform_view_table_main').removeAttr('required'); + jQuery('#jform_view_table_main').removeAttr('aria-required'); + jQuery('#jform_view_table_main').removeClass('required'); + jform_vvvvvzfvyy_required = true; } } } @@ -292,28 +277,28 @@ function vvvvvzg(main_source_vvvvvzg) // set this function logic if (main_source) { - jQuery('#jform_db_table_main').closest('.control-group').show(); - // add required attribute to db_table_main field - if (jform_vvvvvzgvza_required) + jQuery('#jform_view_selection').closest('.control-group').show(); + // add required attribute to view_selection field + if (jform_vvvvvzgvyz_required) { - updateFieldRequired('db_table_main',0); - jQuery('#jform_db_table_main').prop('required','required'); - jQuery('#jform_db_table_main').attr('aria-required',true); - jQuery('#jform_db_table_main').addClass('required'); - jform_vvvvvzgvza_required = false; + updateFieldRequired('view_selection',0); + jQuery('#jform_view_selection').prop('required','required'); + jQuery('#jform_view_selection').attr('aria-required',true); + jQuery('#jform_view_selection').addClass('required'); + jform_vvvvvzgvyz_required = false; } } else { - jQuery('#jform_db_table_main').closest('.control-group').hide(); - // remove required attribute from db_table_main field - if (!jform_vvvvvzgvza_required) + jQuery('#jform_view_selection').closest('.control-group').hide(); + // remove required attribute from view_selection field + if (!jform_vvvvvzgvyz_required) { - updateFieldRequired('db_table_main',1); - jQuery('#jform_db_table_main').removeAttr('required'); - jQuery('#jform_db_table_main').removeAttr('aria-required'); - jQuery('#jform_db_table_main').removeClass('required'); - jform_vvvvvzgvza_required = true; + updateFieldRequired('view_selection',1); + jQuery('#jform_view_selection').removeAttr('required'); + jQuery('#jform_view_selection').removeAttr('aria-required'); + jQuery('#jform_view_selection').removeClass('required'); + jform_vvvvvzgvyz_required = true; } } } @@ -322,7 +307,7 @@ function vvvvvzg(main_source_vvvvvzg) function main_source_vvvvvzg_SomeFunc(main_source_vvvvvzg) { // set the function logic - if (main_source_vvvvvzg == 2) + if (main_source_vvvvvzg == 1) { return true; } @@ -348,28 +333,28 @@ function vvvvvzh(main_source_vvvvvzh) // set this function logic if (main_source) { - jQuery('#jform_db_selection').closest('.control-group').show(); - // add required attribute to db_selection field - if (jform_vvvvvzhvzb_required) + jQuery('#jform_db_table_main').closest('.control-group').show(); + // add required attribute to db_table_main field + if (jform_vvvvvzhvza_required) { - updateFieldRequired('db_selection',0); - jQuery('#jform_db_selection').prop('required','required'); - jQuery('#jform_db_selection').attr('aria-required',true); - jQuery('#jform_db_selection').addClass('required'); - jform_vvvvvzhvzb_required = false; + updateFieldRequired('db_table_main',0); + jQuery('#jform_db_table_main').prop('required','required'); + jQuery('#jform_db_table_main').attr('aria-required',true); + jQuery('#jform_db_table_main').addClass('required'); + jform_vvvvvzhvza_required = false; } } else { - jQuery('#jform_db_selection').closest('.control-group').hide(); - // remove required attribute from db_selection field - if (!jform_vvvvvzhvzb_required) + jQuery('#jform_db_table_main').closest('.control-group').hide(); + // remove required attribute from db_table_main field + if (!jform_vvvvvzhvza_required) { - updateFieldRequired('db_selection',1); - jQuery('#jform_db_selection').removeAttr('required'); - jQuery('#jform_db_selection').removeAttr('aria-required'); - jQuery('#jform_db_selection').removeClass('required'); - jform_vvvvvzhvzb_required = true; + updateFieldRequired('db_table_main',1); + jQuery('#jform_db_table_main').removeAttr('required'); + jQuery('#jform_db_table_main').removeAttr('aria-required'); + jQuery('#jform_db_table_main').removeClass('required'); + jform_vvvvvzhvza_required = true; } } } @@ -386,98 +371,93 @@ function main_source_vvvvvzh_SomeFunc(main_source_vvvvvzh) } // the vvvvvzi function -function vvvvvzi(addcalculation_vvvvvzi) +function vvvvvzi(main_source_vvvvvzi) +{ + if (isSet(main_source_vvvvvzi) && main_source_vvvvvzi.constructor !== Array) + { + var temp_vvvvvzi = main_source_vvvvvzi; + var main_source_vvvvvzi = []; + main_source_vvvvvzi.push(temp_vvvvvzi); + } + else if (!isSet(main_source_vvvvvzi)) + { + var main_source_vvvvvzi = []; + } + var main_source = main_source_vvvvvzi.some(main_source_vvvvvzi_SomeFunc); + + + // set this function logic + if (main_source) + { + jQuery('#jform_db_selection').closest('.control-group').show(); + // add required attribute to db_selection field + if (jform_vvvvvzivzb_required) + { + updateFieldRequired('db_selection',0); + jQuery('#jform_db_selection').prop('required','required'); + jQuery('#jform_db_selection').attr('aria-required',true); + jQuery('#jform_db_selection').addClass('required'); + jform_vvvvvzivzb_required = false; + } + } + else + { + jQuery('#jform_db_selection').closest('.control-group').hide(); + // remove required attribute from db_selection field + if (!jform_vvvvvzivzb_required) + { + updateFieldRequired('db_selection',1); + jQuery('#jform_db_selection').removeAttr('required'); + jQuery('#jform_db_selection').removeAttr('aria-required'); + jQuery('#jform_db_selection').removeClass('required'); + jform_vvvvvzivzb_required = true; + } + } +} + +// the vvvvvzi Some function +function main_source_vvvvvzi_SomeFunc(main_source_vvvvvzi) { // set the function logic - if (addcalculation_vvvvvzi == 1) + if (main_source_vvvvvzi == 2) + { + return true; + } + return false; +} + +// the vvvvvzj function +function vvvvvzj(addcalculation_vvvvvzj) +{ + // set the function logic + if (addcalculation_vvvvvzj == 1) { jQuery('#jform_php_calculation-lbl').closest('.control-group').show(); // add required attribute to php_calculation field - if (jform_vvvvvzivzc_required) + if (jform_vvvvvzjvzc_required) { updateFieldRequired('php_calculation',0); jQuery('#jform_php_calculation').prop('required','required'); jQuery('#jform_php_calculation').attr('aria-required',true); jQuery('#jform_php_calculation').addClass('required'); - jform_vvvvvzivzc_required = false; + jform_vvvvvzjvzc_required = false; } } else { jQuery('#jform_php_calculation-lbl').closest('.control-group').hide(); // remove required attribute from php_calculation field - if (!jform_vvvvvzivzc_required) + if (!jform_vvvvvzjvzc_required) { updateFieldRequired('php_calculation',1); jQuery('#jform_php_calculation').removeAttr('required'); jQuery('#jform_php_calculation').removeAttr('aria-required'); jQuery('#jform_php_calculation').removeClass('required'); - jform_vvvvvzivzc_required = true; + jform_vvvvvzjvzc_required = true; } } } -// the vvvvvzj function -function vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj) -{ - if (isSet(addcalculation_vvvvvzj) && addcalculation_vvvvvzj.constructor !== Array) - { - var temp_vvvvvzj = addcalculation_vvvvvzj; - var addcalculation_vvvvvzj = []; - addcalculation_vvvvvzj.push(temp_vvvvvzj); - } - else if (!isSet(addcalculation_vvvvvzj)) - { - var addcalculation_vvvvvzj = []; - } - var addcalculation = addcalculation_vvvvvzj.some(addcalculation_vvvvvzj_SomeFunc); - - if (isSet(gettype_vvvvvzj) && gettype_vvvvvzj.constructor !== Array) - { - var temp_vvvvvzj = gettype_vvvvvzj; - var gettype_vvvvvzj = []; - gettype_vvvvvzj.push(temp_vvvvvzj); - } - else if (!isSet(gettype_vvvvvzj)) - { - var gettype_vvvvvzj = []; - } - var gettype = gettype_vvvvvzj.some(gettype_vvvvvzj_SomeFunc); - - - // set this function logic - if (addcalculation && gettype) - { - jQuery('.note_calculation_item').closest('.control-group').show(); - } - else - { - jQuery('.note_calculation_item').closest('.control-group').hide(); - } -} - -// the vvvvvzj Some function -function addcalculation_vvvvvzj_SomeFunc(addcalculation_vvvvvzj) -{ - // set the function logic - if (addcalculation_vvvvvzj == 1) - { - return true; - } - return false; -} - -// the vvvvvzj Some function -function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj) -{ - // set the function logic - if (gettype_vvvvvzj == 1 || gettype_vvvvvzj == 3) - { - return true; - } - return false; -} - // the vvvvvzk function function vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk) { @@ -509,11 +489,11 @@ function vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk) // set this function logic if (addcalculation && gettype) { - jQuery('.note_calculation_items').closest('.control-group').show(); + jQuery('.note_calculation_item').closest('.control-group').show(); } else { - jQuery('.note_calculation_items').closest('.control-group').hide(); + jQuery('.note_calculation_item').closest('.control-group').hide(); } } @@ -532,63 +512,68 @@ function addcalculation_vvvvvzk_SomeFunc(addcalculation_vvvvvzk) function gettype_vvvvvzk_SomeFunc(gettype_vvvvvzk) { // set the function logic - if (gettype_vvvvvzk == 2 || gettype_vvvvvzk == 4) + if (gettype_vvvvvzk == 1 || gettype_vvvvvzk == 3) { return true; } return false; } -// the vvvvvzn function -function vvvvvzn(main_source_vvvvvzn) +// the vvvvvzl function +function vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl) { - if (isSet(main_source_vvvvvzn) && main_source_vvvvvzn.constructor !== Array) + if (isSet(addcalculation_vvvvvzl) && addcalculation_vvvvvzl.constructor !== Array) { - var temp_vvvvvzn = main_source_vvvvvzn; - var main_source_vvvvvzn = []; - main_source_vvvvvzn.push(temp_vvvvvzn); + var temp_vvvvvzl = addcalculation_vvvvvzl; + var addcalculation_vvvvvzl = []; + addcalculation_vvvvvzl.push(temp_vvvvvzl); } - else if (!isSet(main_source_vvvvvzn)) + else if (!isSet(addcalculation_vvvvvzl)) { - var main_source_vvvvvzn = []; + var addcalculation_vvvvvzl = []; } - var main_source = main_source_vvvvvzn.some(main_source_vvvvvzn_SomeFunc); + var addcalculation = addcalculation_vvvvvzl.some(addcalculation_vvvvvzl_SomeFunc); + + if (isSet(gettype_vvvvvzl) && gettype_vvvvvzl.constructor !== Array) + { + var temp_vvvvvzl = gettype_vvvvvzl; + var gettype_vvvvvzl = []; + gettype_vvvvvzl.push(temp_vvvvvzl); + } + else if (!isSet(gettype_vvvvvzl)) + { + var gettype_vvvvvzl = []; + } + var gettype = gettype_vvvvvzl.some(gettype_vvvvvzl_SomeFunc); // set this function logic - if (main_source) + if (addcalculation && gettype) { - jQuery('#jform_php_custom_get-lbl').closest('.control-group').show(); - // add required attribute to php_custom_get field - if (jform_vvvvvznvzd_required) - { - updateFieldRequired('php_custom_get',0); - jQuery('#jform_php_custom_get').prop('required','required'); - jQuery('#jform_php_custom_get').attr('aria-required',true); - jQuery('#jform_php_custom_get').addClass('required'); - jform_vvvvvznvzd_required = false; - } + jQuery('.note_calculation_items').closest('.control-group').show(); } else { - jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide(); - // remove required attribute from php_custom_get field - if (!jform_vvvvvznvzd_required) - { - updateFieldRequired('php_custom_get',1); - jQuery('#jform_php_custom_get').removeAttr('required'); - jQuery('#jform_php_custom_get').removeAttr('aria-required'); - jQuery('#jform_php_custom_get').removeClass('required'); - jform_vvvvvznvzd_required = true; - } + jQuery('.note_calculation_items').closest('.control-group').hide(); } } -// the vvvvvzn Some function -function main_source_vvvvvzn_SomeFunc(main_source_vvvvvzn) +// the vvvvvzl Some function +function addcalculation_vvvvvzl_SomeFunc(addcalculation_vvvvvzl) { // set the function logic - if (main_source_vvvvvzn == 3) + if (addcalculation_vvvvvzl == 1) + { + return true; + } + return false; +} + +// the vvvvvzl Some function +function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl) +{ + // set the function logic + if (gettype_vvvvvzl == 2 || gettype_vvvvvzl == 4) { return true; } @@ -611,6 +596,62 @@ function vvvvvzo(main_source_vvvvvzo) var main_source = main_source_vvvvvzo.some(main_source_vvvvvzo_SomeFunc); + // set this function logic + if (main_source) + { + jQuery('#jform_php_custom_get-lbl').closest('.control-group').show(); + // add required attribute to php_custom_get field + if (jform_vvvvvzovzd_required) + { + updateFieldRequired('php_custom_get',0); + jQuery('#jform_php_custom_get').prop('required','required'); + jQuery('#jform_php_custom_get').attr('aria-required',true); + jQuery('#jform_php_custom_get').addClass('required'); + jform_vvvvvzovzd_required = false; + } + } + else + { + jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide(); + // remove required attribute from php_custom_get field + if (!jform_vvvvvzovzd_required) + { + updateFieldRequired('php_custom_get',1); + jQuery('#jform_php_custom_get').removeAttr('required'); + jQuery('#jform_php_custom_get').removeAttr('aria-required'); + jQuery('#jform_php_custom_get').removeClass('required'); + jform_vvvvvzovzd_required = true; + } + } +} + +// the vvvvvzo Some function +function main_source_vvvvvzo_SomeFunc(main_source_vvvvvzo) +{ + // set the function logic + if (main_source_vvvvvzo == 3) + { + return true; + } + return false; +} + +// the vvvvvzp function +function vvvvvzp(main_source_vvvvvzp) +{ + if (isSet(main_source_vvvvvzp) && main_source_vvvvvzp.constructor !== Array) + { + var temp_vvvvvzp = main_source_vvvvvzp; + var main_source_vvvvvzp = []; + main_source_vvvvvzp.push(temp_vvvvvzp); + } + else if (!isSet(main_source_vvvvvzp)) + { + var main_source_vvvvvzp = []; + } + var main_source = main_source_vvvvvzp.some(main_source_vvvvvzp_SomeFunc); + + // set this function logic if (main_source) { @@ -632,90 +673,11 @@ function vvvvvzo(main_source_vvvvvzo) } } -// the vvvvvzo Some function -function main_source_vvvvvzo_SomeFunc(main_source_vvvvvzo) -{ - // set the function logic - if (main_source_vvvvvzo == 1 || main_source_vvvvvzo == 2) - { - return true; - } - return false; -} - -// the vvvvvzp function -function vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp) -{ - if (isSet(add_php_before_getitem_vvvvvzp) && add_php_before_getitem_vvvvvzp.constructor !== Array) - { - var temp_vvvvvzp = add_php_before_getitem_vvvvvzp; - var add_php_before_getitem_vvvvvzp = []; - add_php_before_getitem_vvvvvzp.push(temp_vvvvvzp); - } - else if (!isSet(add_php_before_getitem_vvvvvzp)) - { - var add_php_before_getitem_vvvvvzp = []; - } - var add_php_before_getitem = add_php_before_getitem_vvvvvzp.some(add_php_before_getitem_vvvvvzp_SomeFunc); - - if (isSet(gettype_vvvvvzp) && gettype_vvvvvzp.constructor !== Array) - { - var temp_vvvvvzp = gettype_vvvvvzp; - var gettype_vvvvvzp = []; - gettype_vvvvvzp.push(temp_vvvvvzp); - } - else if (!isSet(gettype_vvvvvzp)) - { - var gettype_vvvvvzp = []; - } - var gettype = gettype_vvvvvzp.some(gettype_vvvvvzp_SomeFunc); - - - // set this function logic - if (add_php_before_getitem && gettype) - { - jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show(); - // add required attribute to php_before_getitem field - if (jform_vvvvvzpvze_required) - { - updateFieldRequired('php_before_getitem',0); - jQuery('#jform_php_before_getitem').prop('required','required'); - jQuery('#jform_php_before_getitem').attr('aria-required',true); - jQuery('#jform_php_before_getitem').addClass('required'); - jform_vvvvvzpvze_required = false; - } - } - else - { - jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_getitem field - if (!jform_vvvvvzpvze_required) - { - updateFieldRequired('php_before_getitem',1); - jQuery('#jform_php_before_getitem').removeAttr('required'); - jQuery('#jform_php_before_getitem').removeAttr('aria-required'); - jQuery('#jform_php_before_getitem').removeClass('required'); - jform_vvvvvzpvze_required = true; - } - } -} - // the vvvvvzp Some function -function add_php_before_getitem_vvvvvzp_SomeFunc(add_php_before_getitem_vvvvvzp) +function main_source_vvvvvzp_SomeFunc(main_source_vvvvvzp) { // set the function logic - if (add_php_before_getitem_vvvvvzp == 1) - { - return true; - } - return false; -} - -// the vvvvvzp Some function -function gettype_vvvvvzp_SomeFunc(gettype_vvvvvzp) -{ - // set the function logic - if (gettype_vvvvvzp == 1 || gettype_vvvvvzp == 3) + if (main_source_vvvvvzp == 1 || main_source_vvvvvzp == 2) { return true; } @@ -723,19 +685,19 @@ function gettype_vvvvvzp_SomeFunc(gettype_vvvvvzp) } // the vvvvvzq function -function vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq) +function vvvvvzq(add_php_before_getitem_vvvvvzq,gettype_vvvvvzq) { - if (isSet(add_php_after_getitem_vvvvvzq) && add_php_after_getitem_vvvvvzq.constructor !== Array) + if (isSet(add_php_before_getitem_vvvvvzq) && add_php_before_getitem_vvvvvzq.constructor !== Array) { - var temp_vvvvvzq = add_php_after_getitem_vvvvvzq; - var add_php_after_getitem_vvvvvzq = []; - add_php_after_getitem_vvvvvzq.push(temp_vvvvvzq); + var temp_vvvvvzq = add_php_before_getitem_vvvvvzq; + var add_php_before_getitem_vvvvvzq = []; + add_php_before_getitem_vvvvvzq.push(temp_vvvvvzq); } - else if (!isSet(add_php_after_getitem_vvvvvzq)) + else if (!isSet(add_php_before_getitem_vvvvvzq)) { - var add_php_after_getitem_vvvvvzq = []; + var add_php_before_getitem_vvvvvzq = []; } - var add_php_after_getitem = add_php_after_getitem_vvvvvzq.some(add_php_after_getitem_vvvvvzq_SomeFunc); + var add_php_before_getitem = add_php_before_getitem_vvvvvzq.some(add_php_before_getitem_vvvvvzq_SomeFunc); if (isSet(gettype_vvvvvzq) && gettype_vvvvvzq.constructor !== Array) { @@ -751,39 +713,39 @@ function vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq) // set this function logic - if (add_php_after_getitem && gettype) + if (add_php_before_getitem && gettype) { - jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show(); - // add required attribute to php_after_getitem field - if (jform_vvvvvzqvzf_required) + jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show(); + // add required attribute to php_before_getitem field + if (jform_vvvvvzqvze_required) { - updateFieldRequired('php_after_getitem',0); - jQuery('#jform_php_after_getitem').prop('required','required'); - jQuery('#jform_php_after_getitem').attr('aria-required',true); - jQuery('#jform_php_after_getitem').addClass('required'); - jform_vvvvvzqvzf_required = false; + updateFieldRequired('php_before_getitem',0); + jQuery('#jform_php_before_getitem').prop('required','required'); + jQuery('#jform_php_before_getitem').attr('aria-required',true); + jQuery('#jform_php_before_getitem').addClass('required'); + jform_vvvvvzqvze_required = false; } } else { - jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_getitem field - if (!jform_vvvvvzqvzf_required) + jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide(); + // remove required attribute from php_before_getitem field + if (!jform_vvvvvzqvze_required) { - updateFieldRequired('php_after_getitem',1); - jQuery('#jform_php_after_getitem').removeAttr('required'); - jQuery('#jform_php_after_getitem').removeAttr('aria-required'); - jQuery('#jform_php_after_getitem').removeClass('required'); - jform_vvvvvzqvzf_required = true; + updateFieldRequired('php_before_getitem',1); + jQuery('#jform_php_before_getitem').removeAttr('required'); + jQuery('#jform_php_before_getitem').removeAttr('aria-required'); + jQuery('#jform_php_before_getitem').removeClass('required'); + jform_vvvvvzqvze_required = true; } } } // the vvvvvzq Some function -function add_php_after_getitem_vvvvvzq_SomeFunc(add_php_after_getitem_vvvvvzq) +function add_php_before_getitem_vvvvvzq_SomeFunc(add_php_before_getitem_vvvvvzq) { // set the function logic - if (add_php_after_getitem_vvvvvzq == 1) + if (add_php_before_getitem_vvvvvzq == 1) { return true; } @@ -801,76 +763,79 @@ function gettype_vvvvvzq_SomeFunc(gettype_vvvvvzq) return false; } -// the vvvvvzs function -function vvvvvzs(gettype_vvvvvzs) +// the vvvvvzr function +function vvvvvzr(add_php_after_getitem_vvvvvzr,gettype_vvvvvzr) { - if (isSet(gettype_vvvvvzs) && gettype_vvvvvzs.constructor !== Array) + if (isSet(add_php_after_getitem_vvvvvzr) && add_php_after_getitem_vvvvvzr.constructor !== Array) { - var temp_vvvvvzs = gettype_vvvvvzs; - var gettype_vvvvvzs = []; - gettype_vvvvvzs.push(temp_vvvvvzs); + var temp_vvvvvzr = add_php_after_getitem_vvvvvzr; + var add_php_after_getitem_vvvvvzr = []; + add_php_after_getitem_vvvvvzr.push(temp_vvvvvzr); } - else if (!isSet(gettype_vvvvvzs)) + else if (!isSet(add_php_after_getitem_vvvvvzr)) { - var gettype_vvvvvzs = []; + var add_php_after_getitem_vvvvvzr = []; } - var gettype = gettype_vvvvvzs.some(gettype_vvvvvzs_SomeFunc); + var add_php_after_getitem = add_php_after_getitem_vvvvvzr.some(add_php_after_getitem_vvvvvzr_SomeFunc); + + if (isSet(gettype_vvvvvzr) && gettype_vvvvvzr.constructor !== Array) + { + var temp_vvvvvzr = gettype_vvvvvzr; + var gettype_vvvvvzr = []; + gettype_vvvvvzr.push(temp_vvvvvzr); + } + else if (!isSet(gettype_vvvvvzr)) + { + var gettype_vvvvvzr = []; + } + var gettype = gettype_vvvvvzr.some(gettype_vvvvvzr_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitem && gettype) { - jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); - // add required attribute to add_php_after_getitem field - if (jform_vvvvvzsvzg_required) + jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show(); + // add required attribute to php_after_getitem field + if (jform_vvvvvzrvzf_required) { - updateFieldRequired('add_php_after_getitem',0); - jQuery('#jform_add_php_after_getitem').prop('required','required'); - jQuery('#jform_add_php_after_getitem').attr('aria-required',true); - jQuery('#jform_add_php_after_getitem').addClass('required'); - jform_vvvvvzsvzg_required = false; - } - jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - // add required attribute to add_php_before_getitem field - if (jform_vvvvvzsvzh_required) - { - updateFieldRequired('add_php_before_getitem',0); - jQuery('#jform_add_php_before_getitem').prop('required','required'); - jQuery('#jform_add_php_before_getitem').attr('aria-required',true); - jQuery('#jform_add_php_before_getitem').addClass('required'); - jform_vvvvvzsvzh_required = false; + updateFieldRequired('php_after_getitem',0); + jQuery('#jform_php_after_getitem').prop('required','required'); + jQuery('#jform_php_after_getitem').attr('aria-required',true); + jQuery('#jform_php_after_getitem').addClass('required'); + jform_vvvvvzrvzf_required = false; } } else { - jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - // remove required attribute from add_php_after_getitem field - if (!jform_vvvvvzsvzg_required) + jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide(); + // remove required attribute from php_after_getitem field + if (!jform_vvvvvzrvzf_required) { - updateFieldRequired('add_php_after_getitem',1); - jQuery('#jform_add_php_after_getitem').removeAttr('required'); - jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); - jQuery('#jform_add_php_after_getitem').removeClass('required'); - jform_vvvvvzsvzg_required = true; - } - jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - // remove required attribute from add_php_before_getitem field - if (!jform_vvvvvzsvzh_required) - { - updateFieldRequired('add_php_before_getitem',1); - jQuery('#jform_add_php_before_getitem').removeAttr('required'); - jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); - jQuery('#jform_add_php_before_getitem').removeClass('required'); - jform_vvvvvzsvzh_required = true; + updateFieldRequired('php_after_getitem',1); + jQuery('#jform_php_after_getitem').removeAttr('required'); + jQuery('#jform_php_after_getitem').removeAttr('aria-required'); + jQuery('#jform_php_after_getitem').removeClass('required'); + jform_vvvvvzrvzf_required = true; } } } -// the vvvvvzs Some function -function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs) +// the vvvvvzr Some function +function add_php_after_getitem_vvvvvzr_SomeFunc(add_php_after_getitem_vvvvvzr) { // set the function logic - if (gettype_vvvvvzs == 1 || gettype_vvvvvzs == 3) + if (add_php_after_getitem_vvvvvzr == 1) + { + return true; + } + return false; +} + +// the vvvvvzr Some function +function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr) +{ + // set the function logic + if (gettype_vvvvvzr == 1 || gettype_vvvvvzr == 3) { return true; } @@ -878,20 +843,8 @@ function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs) } // the vvvvvzt function -function vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt) +function vvvvvzt(gettype_vvvvvzt) { - if (isSet(add_php_getlistquery_vvvvvzt) && add_php_getlistquery_vvvvvzt.constructor !== Array) - { - var temp_vvvvvzt = add_php_getlistquery_vvvvvzt; - var add_php_getlistquery_vvvvvzt = []; - add_php_getlistquery_vvvvvzt.push(temp_vvvvvzt); - } - else if (!isSet(add_php_getlistquery_vvvvvzt)) - { - var add_php_getlistquery_vvvvvzt = []; - } - var add_php_getlistquery = add_php_getlistquery_vvvvvzt.some(add_php_getlistquery_vvvvvzt_SomeFunc); - if (isSet(gettype_vvvvvzt) && gettype_vvvvvzt.constructor !== Array) { var temp_vvvvvzt = gettype_vvvvvzt; @@ -906,50 +859,59 @@ function vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt) // set this function logic - if (add_php_getlistquery && gettype) + if (gettype) { - jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show(); - // add required attribute to php_getlistquery field - if (jform_vvvvvztvzi_required) + jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); + // add required attribute to add_php_after_getitem field + if (jform_vvvvvztvzg_required) { - updateFieldRequired('php_getlistquery',0); - jQuery('#jform_php_getlistquery').prop('required','required'); - jQuery('#jform_php_getlistquery').attr('aria-required',true); - jQuery('#jform_php_getlistquery').addClass('required'); - jform_vvvvvztvzi_required = false; + updateFieldRequired('add_php_after_getitem',0); + jQuery('#jform_add_php_after_getitem').prop('required','required'); + jQuery('#jform_add_php_after_getitem').attr('aria-required',true); + jQuery('#jform_add_php_after_getitem').addClass('required'); + jform_vvvvvztvzg_required = false; + } + jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); + // add required attribute to add_php_before_getitem field + if (jform_vvvvvztvzh_required) + { + updateFieldRequired('add_php_before_getitem',0); + jQuery('#jform_add_php_before_getitem').prop('required','required'); + jQuery('#jform_add_php_before_getitem').attr('aria-required',true); + jQuery('#jform_add_php_before_getitem').addClass('required'); + jform_vvvvvztvzh_required = false; } } else { - jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide(); - // remove required attribute from php_getlistquery field - if (!jform_vvvvvztvzi_required) + jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); + // remove required attribute from add_php_after_getitem field + if (!jform_vvvvvztvzg_required) { - updateFieldRequired('php_getlistquery',1); - jQuery('#jform_php_getlistquery').removeAttr('required'); - jQuery('#jform_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_php_getlistquery').removeClass('required'); - jform_vvvvvztvzi_required = true; + updateFieldRequired('add_php_after_getitem',1); + jQuery('#jform_add_php_after_getitem').removeAttr('required'); + jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); + jQuery('#jform_add_php_after_getitem').removeClass('required'); + jform_vvvvvztvzg_required = true; + } + jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); + // remove required attribute from add_php_before_getitem field + if (!jform_vvvvvztvzh_required) + { + updateFieldRequired('add_php_before_getitem',1); + jQuery('#jform_add_php_before_getitem').removeAttr('required'); + jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); + jQuery('#jform_add_php_before_getitem').removeClass('required'); + jform_vvvvvztvzh_required = true; } } } -// the vvvvvzt Some function -function add_php_getlistquery_vvvvvzt_SomeFunc(add_php_getlistquery_vvvvvzt) -{ - // set the function logic - if (add_php_getlistquery_vvvvvzt == 1) - { - return true; - } - return false; -} - // the vvvvvzt Some function function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt) { // set the function logic - if (gettype_vvvvvzt == 2 || gettype_vvvvvzt == 4) + if (gettype_vvvvvzt == 1 || gettype_vvvvvzt == 3) { return true; } @@ -957,19 +919,19 @@ function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt) } // the vvvvvzu function -function vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu) +function vvvvvzu(add_php_getlistquery_vvvvvzu,gettype_vvvvvzu) { - if (isSet(add_php_before_getitems_vvvvvzu) && add_php_before_getitems_vvvvvzu.constructor !== Array) + if (isSet(add_php_getlistquery_vvvvvzu) && add_php_getlistquery_vvvvvzu.constructor !== Array) { - var temp_vvvvvzu = add_php_before_getitems_vvvvvzu; - var add_php_before_getitems_vvvvvzu = []; - add_php_before_getitems_vvvvvzu.push(temp_vvvvvzu); + var temp_vvvvvzu = add_php_getlistquery_vvvvvzu; + var add_php_getlistquery_vvvvvzu = []; + add_php_getlistquery_vvvvvzu.push(temp_vvvvvzu); } - else if (!isSet(add_php_before_getitems_vvvvvzu)) + else if (!isSet(add_php_getlistquery_vvvvvzu)) { - var add_php_before_getitems_vvvvvzu = []; + var add_php_getlistquery_vvvvvzu = []; } - var add_php_before_getitems = add_php_before_getitems_vvvvvzu.some(add_php_before_getitems_vvvvvzu_SomeFunc); + var add_php_getlistquery = add_php_getlistquery_vvvvvzu.some(add_php_getlistquery_vvvvvzu_SomeFunc); if (isSet(gettype_vvvvvzu) && gettype_vvvvvzu.constructor !== Array) { @@ -985,39 +947,39 @@ function vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu) // set this function logic - if (add_php_before_getitems && gettype) + if (add_php_getlistquery && gettype) { - jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show(); - // add required attribute to php_before_getitems field - if (jform_vvvvvzuvzj_required) + jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show(); + // add required attribute to php_getlistquery field + if (jform_vvvvvzuvzi_required) { - updateFieldRequired('php_before_getitems',0); - jQuery('#jform_php_before_getitems').prop('required','required'); - jQuery('#jform_php_before_getitems').attr('aria-required',true); - jQuery('#jform_php_before_getitems').addClass('required'); - jform_vvvvvzuvzj_required = false; + updateFieldRequired('php_getlistquery',0); + jQuery('#jform_php_getlistquery').prop('required','required'); + jQuery('#jform_php_getlistquery').attr('aria-required',true); + jQuery('#jform_php_getlistquery').addClass('required'); + jform_vvvvvzuvzi_required = false; } } else { - jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_getitems field - if (!jform_vvvvvzuvzj_required) + jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide(); + // remove required attribute from php_getlistquery field + if (!jform_vvvvvzuvzi_required) { - updateFieldRequired('php_before_getitems',1); - jQuery('#jform_php_before_getitems').removeAttr('required'); - jQuery('#jform_php_before_getitems').removeAttr('aria-required'); - jQuery('#jform_php_before_getitems').removeClass('required'); - jform_vvvvvzuvzj_required = true; + updateFieldRequired('php_getlistquery',1); + jQuery('#jform_php_getlistquery').removeAttr('required'); + jQuery('#jform_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_php_getlistquery').removeClass('required'); + jform_vvvvvzuvzi_required = true; } } } // the vvvvvzu Some function -function add_php_before_getitems_vvvvvzu_SomeFunc(add_php_before_getitems_vvvvvzu) +function add_php_getlistquery_vvvvvzu_SomeFunc(add_php_getlistquery_vvvvvzu) { // set the function logic - if (add_php_before_getitems_vvvvvzu == 1) + if (add_php_getlistquery_vvvvvzu == 1) { return true; } @@ -1036,19 +998,19 @@ function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu) } // the vvvvvzv function -function vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv) +function vvvvvzv(add_php_before_getitems_vvvvvzv,gettype_vvvvvzv) { - if (isSet(add_php_after_getitems_vvvvvzv) && add_php_after_getitems_vvvvvzv.constructor !== Array) + if (isSet(add_php_before_getitems_vvvvvzv) && add_php_before_getitems_vvvvvzv.constructor !== Array) { - var temp_vvvvvzv = add_php_after_getitems_vvvvvzv; - var add_php_after_getitems_vvvvvzv = []; - add_php_after_getitems_vvvvvzv.push(temp_vvvvvzv); + var temp_vvvvvzv = add_php_before_getitems_vvvvvzv; + var add_php_before_getitems_vvvvvzv = []; + add_php_before_getitems_vvvvvzv.push(temp_vvvvvzv); } - else if (!isSet(add_php_after_getitems_vvvvvzv)) + else if (!isSet(add_php_before_getitems_vvvvvzv)) { - var add_php_after_getitems_vvvvvzv = []; + var add_php_before_getitems_vvvvvzv = []; } - var add_php_after_getitems = add_php_after_getitems_vvvvvzv.some(add_php_after_getitems_vvvvvzv_SomeFunc); + var add_php_before_getitems = add_php_before_getitems_vvvvvzv.some(add_php_before_getitems_vvvvvzv_SomeFunc); if (isSet(gettype_vvvvvzv) && gettype_vvvvvzv.constructor !== Array) { @@ -1064,39 +1026,39 @@ function vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv) // set this function logic - if (add_php_after_getitems && gettype) + if (add_php_before_getitems && gettype) { - jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show(); - // add required attribute to php_after_getitems field - if (jform_vvvvvzvvzk_required) + jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show(); + // add required attribute to php_before_getitems field + if (jform_vvvvvzvvzj_required) { - updateFieldRequired('php_after_getitems',0); - jQuery('#jform_php_after_getitems').prop('required','required'); - jQuery('#jform_php_after_getitems').attr('aria-required',true); - jQuery('#jform_php_after_getitems').addClass('required'); - jform_vvvvvzvvzk_required = false; + updateFieldRequired('php_before_getitems',0); + jQuery('#jform_php_before_getitems').prop('required','required'); + jQuery('#jform_php_before_getitems').attr('aria-required',true); + jQuery('#jform_php_before_getitems').addClass('required'); + jform_vvvvvzvvzj_required = false; } } else { - jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_getitems field - if (!jform_vvvvvzvvzk_required) + jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide(); + // remove required attribute from php_before_getitems field + if (!jform_vvvvvzvvzj_required) { - updateFieldRequired('php_after_getitems',1); - jQuery('#jform_php_after_getitems').removeAttr('required'); - jQuery('#jform_php_after_getitems').removeAttr('aria-required'); - jQuery('#jform_php_after_getitems').removeClass('required'); - jform_vvvvvzvvzk_required = true; + updateFieldRequired('php_before_getitems',1); + jQuery('#jform_php_before_getitems').removeAttr('required'); + jQuery('#jform_php_before_getitems').removeAttr('aria-required'); + jQuery('#jform_php_before_getitems').removeClass('required'); + jform_vvvvvzvvzj_required = true; } } } // the vvvvvzv Some function -function add_php_after_getitems_vvvvvzv_SomeFunc(add_php_after_getitems_vvvvvzv) +function add_php_before_getitems_vvvvvzv_SomeFunc(add_php_before_getitems_vvvvvzv) { // set the function logic - if (add_php_after_getitems_vvvvvzv == 1) + if (add_php_before_getitems_vvvvvzv == 1) { return true; } @@ -1114,96 +1076,79 @@ function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv) return false; } -// the vvvvvzx function -function vvvvvzx(gettype_vvvvvzx) +// the vvvvvzw function +function vvvvvzw(add_php_after_getitems_vvvvvzw,gettype_vvvvvzw) { - if (isSet(gettype_vvvvvzx) && gettype_vvvvvzx.constructor !== Array) + if (isSet(add_php_after_getitems_vvvvvzw) && add_php_after_getitems_vvvvvzw.constructor !== Array) { - var temp_vvvvvzx = gettype_vvvvvzx; - var gettype_vvvvvzx = []; - gettype_vvvvvzx.push(temp_vvvvvzx); + var temp_vvvvvzw = add_php_after_getitems_vvvvvzw; + var add_php_after_getitems_vvvvvzw = []; + add_php_after_getitems_vvvvvzw.push(temp_vvvvvzw); } - else if (!isSet(gettype_vvvvvzx)) + else if (!isSet(add_php_after_getitems_vvvvvzw)) { - var gettype_vvvvvzx = []; + var add_php_after_getitems_vvvvvzw = []; } - var gettype = gettype_vvvvvzx.some(gettype_vvvvvzx_SomeFunc); + var add_php_after_getitems = add_php_after_getitems_vvvvvzw.some(add_php_after_getitems_vvvvvzw_SomeFunc); + + if (isSet(gettype_vvvvvzw) && gettype_vvvvvzw.constructor !== Array) + { + var temp_vvvvvzw = gettype_vvvvvzw; + var gettype_vvvvvzw = []; + gettype_vvvvvzw.push(temp_vvvvvzw); + } + else if (!isSet(gettype_vvvvvzw)) + { + var gettype_vvvvvzw = []; + } + var gettype = gettype_vvvvvzw.some(gettype_vvvvvzw_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitems && gettype) { - jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); - // add required attribute to add_php_after_getitems field - if (jform_vvvvvzxvzl_required) + jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show(); + // add required attribute to php_after_getitems field + if (jform_vvvvvzwvzk_required) { - updateFieldRequired('add_php_after_getitems',0); - jQuery('#jform_add_php_after_getitems').prop('required','required'); - jQuery('#jform_add_php_after_getitems').attr('aria-required',true); - jQuery('#jform_add_php_after_getitems').addClass('required'); - jform_vvvvvzxvzl_required = false; - } - jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - // add required attribute to add_php_before_getitems field - if (jform_vvvvvzxvzm_required) - { - updateFieldRequired('add_php_before_getitems',0); - jQuery('#jform_add_php_before_getitems').prop('required','required'); - jQuery('#jform_add_php_before_getitems').attr('aria-required',true); - jQuery('#jform_add_php_before_getitems').addClass('required'); - jform_vvvvvzxvzm_required = false; - } - jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - // add required attribute to add_php_getlistquery field - if (jform_vvvvvzxvzn_required) - { - updateFieldRequired('add_php_getlistquery',0); - jQuery('#jform_add_php_getlistquery').prop('required','required'); - jQuery('#jform_add_php_getlistquery').attr('aria-required',true); - jQuery('#jform_add_php_getlistquery').addClass('required'); - jform_vvvvvzxvzn_required = false; + updateFieldRequired('php_after_getitems',0); + jQuery('#jform_php_after_getitems').prop('required','required'); + jQuery('#jform_php_after_getitems').attr('aria-required',true); + jQuery('#jform_php_after_getitems').addClass('required'); + jform_vvvvvzwvzk_required = false; } } else { - jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - // remove required attribute from add_php_after_getitems field - if (!jform_vvvvvzxvzl_required) + jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide(); + // remove required attribute from php_after_getitems field + if (!jform_vvvvvzwvzk_required) { - updateFieldRequired('add_php_after_getitems',1); - jQuery('#jform_add_php_after_getitems').removeAttr('required'); - jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); - jQuery('#jform_add_php_after_getitems').removeClass('required'); - jform_vvvvvzxvzl_required = true; - } - jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - // remove required attribute from add_php_before_getitems field - if (!jform_vvvvvzxvzm_required) - { - updateFieldRequired('add_php_before_getitems',1); - jQuery('#jform_add_php_before_getitems').removeAttr('required'); - jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); - jQuery('#jform_add_php_before_getitems').removeClass('required'); - jform_vvvvvzxvzm_required = true; - } - jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - // remove required attribute from add_php_getlistquery field - if (!jform_vvvvvzxvzn_required) - { - updateFieldRequired('add_php_getlistquery',1); - jQuery('#jform_add_php_getlistquery').removeAttr('required'); - jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_add_php_getlistquery').removeClass('required'); - jform_vvvvvzxvzn_required = true; + updateFieldRequired('php_after_getitems',1); + jQuery('#jform_php_after_getitems').removeAttr('required'); + jQuery('#jform_php_after_getitems').removeAttr('aria-required'); + jQuery('#jform_php_after_getitems').removeClass('required'); + jform_vvvvvzwvzk_required = true; } } } -// the vvvvvzx Some function -function gettype_vvvvvzx_SomeFunc(gettype_vvvvvzx) +// the vvvvvzw Some function +function add_php_after_getitems_vvvvvzw_SomeFunc(add_php_after_getitems_vvvvvzw) { // set the function logic - if (gettype_vvvvvzx == 2 || gettype_vvvvvzx == 4) + if (add_php_after_getitems_vvvvvzw == 1) + { + return true; + } + return false; +} + +// the vvvvvzw Some function +function gettype_vvvvvzw_SomeFunc(gettype_vvvvvzw) +{ + // set the function logic + if (gettype_vvvvvzw == 2 || gettype_vvvvvzw == 4) { return true; } @@ -1229,28 +1174,68 @@ function vvvvvzy(gettype_vvvvvzy) // set this function logic if (gettype) { - jQuery('#jform_pagination').closest('.control-group').show(); - // add required attribute to pagination field - if (jform_vvvvvzyvzo_required) + jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); + // add required attribute to add_php_after_getitems field + if (jform_vvvvvzyvzl_required) { - updateFieldRequired('pagination',0); - jQuery('#jform_pagination').prop('required','required'); - jQuery('#jform_pagination').attr('aria-required',true); - jQuery('#jform_pagination').addClass('required'); - jform_vvvvvzyvzo_required = false; + updateFieldRequired('add_php_after_getitems',0); + jQuery('#jform_add_php_after_getitems').prop('required','required'); + jQuery('#jform_add_php_after_getitems').attr('aria-required',true); + jQuery('#jform_add_php_after_getitems').addClass('required'); + jform_vvvvvzyvzl_required = false; + } + jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); + // add required attribute to add_php_before_getitems field + if (jform_vvvvvzyvzm_required) + { + updateFieldRequired('add_php_before_getitems',0); + jQuery('#jform_add_php_before_getitems').prop('required','required'); + jQuery('#jform_add_php_before_getitems').attr('aria-required',true); + jQuery('#jform_add_php_before_getitems').addClass('required'); + jform_vvvvvzyvzm_required = false; + } + jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); + // add required attribute to add_php_getlistquery field + if (jform_vvvvvzyvzn_required) + { + updateFieldRequired('add_php_getlistquery',0); + jQuery('#jform_add_php_getlistquery').prop('required','required'); + jQuery('#jform_add_php_getlistquery').attr('aria-required',true); + jQuery('#jform_add_php_getlistquery').addClass('required'); + jform_vvvvvzyvzn_required = false; } } else { - jQuery('#jform_pagination').closest('.control-group').hide(); - // remove required attribute from pagination field - if (!jform_vvvvvzyvzo_required) + jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); + // remove required attribute from add_php_after_getitems field + if (!jform_vvvvvzyvzl_required) { - updateFieldRequired('pagination',1); - jQuery('#jform_pagination').removeAttr('required'); - jQuery('#jform_pagination').removeAttr('aria-required'); - jQuery('#jform_pagination').removeClass('required'); - jform_vvvvvzyvzo_required = true; + updateFieldRequired('add_php_after_getitems',1); + jQuery('#jform_add_php_after_getitems').removeAttr('required'); + jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); + jQuery('#jform_add_php_after_getitems').removeClass('required'); + jform_vvvvvzyvzl_required = true; + } + jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); + // remove required attribute from add_php_before_getitems field + if (!jform_vvvvvzyvzm_required) + { + updateFieldRequired('add_php_before_getitems',1); + jQuery('#jform_add_php_before_getitems').removeAttr('required'); + jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); + jQuery('#jform_add_php_before_getitems').removeClass('required'); + jform_vvvvvzyvzm_required = true; + } + jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); + // remove required attribute from add_php_getlistquery field + if (!jform_vvvvvzyvzn_required) + { + updateFieldRequired('add_php_getlistquery',1); + jQuery('#jform_add_php_getlistquery').removeAttr('required'); + jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_add_php_getlistquery').removeClass('required'); + jform_vvvvvzyvzn_required = true; } } } @@ -1259,7 +1244,7 @@ function vvvvvzy(gettype_vvvvvzy) function gettype_vvvvvzy_SomeFunc(gettype_vvvvvzy) { // set the function logic - if (gettype_vvvvvzy == 2) + if (gettype_vvvvvzy == 2 || gettype_vvvvvzy == 4) { return true; } @@ -1285,28 +1270,28 @@ function vvvvvzz(gettype_vvvvvzz) // set this function logic if (gettype) { - jQuery('#jform_add_php_router_parse').closest('.control-group').show(); - // add required attribute to add_php_router_parse field - if (jform_vvvvvzzvzp_required) + jQuery('#jform_pagination').closest('.control-group').show(); + // add required attribute to pagination field + if (jform_vvvvvzzvzo_required) { - updateFieldRequired('add_php_router_parse',0); - jQuery('#jform_add_php_router_parse').prop('required','required'); - jQuery('#jform_add_php_router_parse').attr('aria-required',true); - jQuery('#jform_add_php_router_parse').addClass('required'); - jform_vvvvvzzvzp_required = false; + updateFieldRequired('pagination',0); + jQuery('#jform_pagination').prop('required','required'); + jQuery('#jform_pagination').attr('aria-required',true); + jQuery('#jform_pagination').addClass('required'); + jform_vvvvvzzvzo_required = false; } } else { - jQuery('#jform_add_php_router_parse').closest('.control-group').hide(); - // remove required attribute from add_php_router_parse field - if (!jform_vvvvvzzvzp_required) + jQuery('#jform_pagination').closest('.control-group').hide(); + // remove required attribute from pagination field + if (!jform_vvvvvzzvzo_required) { - updateFieldRequired('add_php_router_parse',1); - jQuery('#jform_add_php_router_parse').removeAttr('required'); - jQuery('#jform_add_php_router_parse').removeAttr('aria-required'); - jQuery('#jform_add_php_router_parse').removeClass('required'); - jform_vvvvvzzvzp_required = true; + updateFieldRequired('pagination',1); + jQuery('#jform_pagination').removeAttr('required'); + jQuery('#jform_pagination').removeAttr('aria-required'); + jQuery('#jform_pagination').removeClass('required'); + jform_vvvvvzzvzo_required = true; } } } @@ -1315,7 +1300,7 @@ function vvvvvzz(gettype_vvvvvzz) function gettype_vvvvvzz_SomeFunc(gettype_vvvvvzz) { // set the function logic - if (gettype_vvvvvzz == 1 || gettype_vvvvvzz == 2) + if (gettype_vvvvvzz == 2) { return true; } @@ -1323,7 +1308,7 @@ function gettype_vvvvvzz_SomeFunc(gettype_vvvvvzz) } // the vvvvwaa function -function vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa) +function vvvvwaa(gettype_vvvvwaa) { if (isSet(gettype_vvvvwaa) && gettype_vvvvwaa.constructor !== Array) { @@ -1337,44 +1322,32 @@ function vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa) } var gettype = gettype_vvvvwaa.some(gettype_vvvvwaa_SomeFunc); - if (isSet(add_php_router_parse_vvvvwaa) && add_php_router_parse_vvvvwaa.constructor !== Array) - { - var temp_vvvvwaa = add_php_router_parse_vvvvwaa; - var add_php_router_parse_vvvvwaa = []; - add_php_router_parse_vvvvwaa.push(temp_vvvvwaa); - } - else if (!isSet(add_php_router_parse_vvvvwaa)) - { - var add_php_router_parse_vvvvwaa = []; - } - var add_php_router_parse = add_php_router_parse_vvvvwaa.some(add_php_router_parse_vvvvwaa_SomeFunc); - // set this function logic - if (gettype && add_php_router_parse) + if (gettype) { - jQuery('#jform_php_router_parse').closest('.control-group').show(); - // add required attribute to php_router_parse field - if (jform_vvvvwaavzq_required) + jQuery('#jform_add_php_router_parse').closest('.control-group').show(); + // add required attribute to add_php_router_parse field + if (jform_vvvvwaavzp_required) { - updateFieldRequired('php_router_parse',0); - jQuery('#jform_php_router_parse').prop('required','required'); - jQuery('#jform_php_router_parse').attr('aria-required',true); - jQuery('#jform_php_router_parse').addClass('required'); - jform_vvvvwaavzq_required = false; + updateFieldRequired('add_php_router_parse',0); + jQuery('#jform_add_php_router_parse').prop('required','required'); + jQuery('#jform_add_php_router_parse').attr('aria-required',true); + jQuery('#jform_add_php_router_parse').addClass('required'); + jform_vvvvwaavzp_required = false; } } else { - jQuery('#jform_php_router_parse').closest('.control-group').hide(); - // remove required attribute from php_router_parse field - if (!jform_vvvvwaavzq_required) + jQuery('#jform_add_php_router_parse').closest('.control-group').hide(); + // remove required attribute from add_php_router_parse field + if (!jform_vvvvwaavzp_required) { - updateFieldRequired('php_router_parse',1); - jQuery('#jform_php_router_parse').removeAttr('required'); - jQuery('#jform_php_router_parse').removeAttr('aria-required'); - jQuery('#jform_php_router_parse').removeClass('required'); - jform_vvvvwaavzq_required = true; + updateFieldRequired('add_php_router_parse',1); + jQuery('#jform_add_php_router_parse').removeAttr('required'); + jQuery('#jform_add_php_router_parse').removeAttr('aria-required'); + jQuery('#jform_add_php_router_parse').removeClass('required'); + jform_vvvvwaavzp_required = true; } } } @@ -1390,31 +1363,99 @@ function gettype_vvvvwaa_SomeFunc(gettype_vvvvwaa) return false; } -// the vvvvwaa Some function -function add_php_router_parse_vvvvwaa_SomeFunc(add_php_router_parse_vvvvwaa) +// the vvvvwab function +function vvvvwab(gettype_vvvvwab,add_php_router_parse_vvvvwab) +{ + if (isSet(gettype_vvvvwab) && gettype_vvvvwab.constructor !== Array) + { + var temp_vvvvwab = gettype_vvvvwab; + var gettype_vvvvwab = []; + gettype_vvvvwab.push(temp_vvvvwab); + } + else if (!isSet(gettype_vvvvwab)) + { + var gettype_vvvvwab = []; + } + var gettype = gettype_vvvvwab.some(gettype_vvvvwab_SomeFunc); + + if (isSet(add_php_router_parse_vvvvwab) && add_php_router_parse_vvvvwab.constructor !== Array) + { + var temp_vvvvwab = add_php_router_parse_vvvvwab; + var add_php_router_parse_vvvvwab = []; + add_php_router_parse_vvvvwab.push(temp_vvvvwab); + } + else if (!isSet(add_php_router_parse_vvvvwab)) + { + var add_php_router_parse_vvvvwab = []; + } + var add_php_router_parse = add_php_router_parse_vvvvwab.some(add_php_router_parse_vvvvwab_SomeFunc); + + + // set this function logic + if (gettype && add_php_router_parse) + { + jQuery('#jform_php_router_parse').closest('.control-group').show(); + // add required attribute to php_router_parse field + if (jform_vvvvwabvzq_required) + { + updateFieldRequired('php_router_parse',0); + jQuery('#jform_php_router_parse').prop('required','required'); + jQuery('#jform_php_router_parse').attr('aria-required',true); + jQuery('#jform_php_router_parse').addClass('required'); + jform_vvvvwabvzq_required = false; + } + } + else + { + jQuery('#jform_php_router_parse').closest('.control-group').hide(); + // remove required attribute from php_router_parse field + if (!jform_vvvvwabvzq_required) + { + updateFieldRequired('php_router_parse',1); + jQuery('#jform_php_router_parse').removeAttr('required'); + jQuery('#jform_php_router_parse').removeAttr('aria-required'); + jQuery('#jform_php_router_parse').removeClass('required'); + jform_vvvvwabvzq_required = true; + } + } +} + +// the vvvvwab Some function +function gettype_vvvvwab_SomeFunc(gettype_vvvvwab) { // set the function logic - if (add_php_router_parse_vvvvwaa == 1) + if (gettype_vvvvwab == 1 || gettype_vvvvwab == 2) { return true; } return false; } -// the vvvvwac function -function vvvvwac(gettype_vvvvwac) +// the vvvvwab Some function +function add_php_router_parse_vvvvwab_SomeFunc(add_php_router_parse_vvvvwab) { - if (isSet(gettype_vvvvwac) && gettype_vvvvwac.constructor !== Array) + // set the function logic + if (add_php_router_parse_vvvvwab == 1) { - var temp_vvvvwac = gettype_vvvvwac; - var gettype_vvvvwac = []; - gettype_vvvvwac.push(temp_vvvvwac); + return true; } - else if (!isSet(gettype_vvvvwac)) + return false; +} + +// the vvvvwad function +function vvvvwad(gettype_vvvvwad) +{ + if (isSet(gettype_vvvvwad) && gettype_vvvvwad.constructor !== Array) { - var gettype_vvvvwac = []; + var temp_vvvvwad = gettype_vvvvwad; + var gettype_vvvvwad = []; + gettype_vvvvwad.push(temp_vvvvwad); } - var gettype = gettype_vvvvwac.some(gettype_vvvvwac_SomeFunc); + else if (!isSet(gettype_vvvvwad)) + { + var gettype_vvvvwad = []; + } + var gettype = gettype_vvvvwad.some(gettype_vvvvwad_SomeFunc); // set this function logic @@ -1428,11 +1469,11 @@ function vvvvwac(gettype_vvvvwac) } } -// the vvvvwac Some function -function gettype_vvvvwac_SomeFunc(gettype_vvvvwac) +// the vvvvwad Some function +function gettype_vvvvwad_SomeFunc(gettype_vvvvwad) { // set the function logic - if (gettype_vvvvwac == 1) + if (gettype_vvvvwad == 1) { return true; } @@ -1482,6 +1523,10 @@ jQuery(document).ready(function() getLinked(); var valueSwitch = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val(); getDynamicScripts(valueSwitch); + // get the selected value of the select_all + var select_all = jQuery("#jform_select_all input[type='radio']:checked").val(); + // make sure the selection is correct + setSelectAll(select_all); }); function getLinked_server(type){ @@ -1506,8 +1551,37 @@ function getLinked(){ }); } -function getViewTableColumns_server(viewId,asKey,rowType) -{ +function setSelectAll(select_all){ + // get source type + var main_source = jQuery("#jform_main_source").val(); + if (1 == main_source) { + var key = 'view'; + } else if (2 == main_source) { + var key = 'db'; + } else { + return true; + } + // only continue if set + if (select_all == 1) { + // set default notice + jQuery("#jform_"+key+"_selection").val('a.*'); + // set the selection text area to read only + jQuery("#jform_"+key+"_selection").prop("readonly", true); + } else { + // remove the read only from selection text area + jQuery("#jform_"+key+"_selection").prop("readonly", false); + // get selected options + var value_main = jQuery("#jform_"+key+"_table_main option:selected").val(); + // make sure that all fields are set as selected + if (key === 'view') { + getViewTableColumns(value_main, 'a', key, 3, true, '', ''); + } else { + getDbTableColumns(value_main, 'a', key, 3, true, '', ''); + } + } +} + +function getViewTableColumns_server(viewId,asKey,rowType){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true"; if (token.length > 0 && viewId > 0 && asKey.length > 0) { @@ -1522,8 +1596,16 @@ function getViewTableColumns_server(viewId,asKey,rowType) }); } -function getViewTableColumns(id,asKey,key,rowType,main, table_, nr_) -{ +function getViewTableColumns(id, asKey, key, rowType, main, table_, nr_){ + // check if this is the main view + if (main){ + var select_all = jQuery("#jform_select_all input[type='radio']:checked").val(); + // do not continue if set + if (select_all == 1){ + setSelectAll(select_all); + return true; + } + } getViewTableColumns_server(id,asKey,rowType).done(function(result) { if (result) { @@ -1552,8 +1634,16 @@ function getDbTableColumns_server(name,asKey,rowType) }); } -function getDbTableColumns(name, asKey, key, rowType, main, table_, nr_) -{ +function getDbTableColumns(name, asKey, key, rowType, main, table_, nr_){ + // check if this is the main view + if (main){ + var select_all = jQuery("#jform_select_all input[type='radio']:checked").val(); + // do not continue if set + if (select_all == 1){ + setSelectAll(select_all); + return true; + } + } getDbTableColumns_server(name,asKey,rowType).done(function(result) { if (result) { @@ -1586,7 +1676,7 @@ function loadSelectionData(result, type, key, main, table_, nr_) jQuery(textArea).val(''); } } -function updateSubItems(fieldName, fieldNr, table_, nr_){ +function updateSubItems(fieldName, fieldNr, table_, nr_) { if(jQuery('#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_'+fieldName+'_table').length) { jQuery('#adminForm').on('change', '#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_'+fieldName+'_table',function (e) { e.preventDefault(); diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml index 4895dc4b6..d019d039d 100644 --- a/admin/models/forms/dynamic_get.xml +++ b/admin/models/forms/dynamic_get.xml @@ -143,6 +143,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + default="0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - params; // will be removed just use $this->params inst