oxido/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

improved the table method generateAlias to only get added if there is an alias in the view

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2018-05-03 01:26:41 +02:00
parent e905aa895f
commit f200e635b8
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
30 changed files with 94 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.7.7
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **193953**
+ *Line count*: **193602**
+ *Field count*: **1027**
+ *File count*: **1201**
+ *Folder count*: **193**

2
admin/README.txt
View File

@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.7.7
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **193953**
+ *Line count*: **193602**
+ *Field count*: **1027**
+ *File count*: **1201**
+ *Folder count*: **193**

11
admin/helpers/compiler/e_Interpretation.php
View File

@ -5757,24 +5757,31 @@ class Interpretation extends Fields
public function setGenerateNewAlias($viewName_single)
{
// make sure this view has an alias
if (isset($this->customAliasBuilder[$viewName_single]) || isset($this->titleBuilder[$viewName_single]))
if (isset($this->aliasBuilder[$viewName_single]))
{
// set the title stuff
if (isset($this->customAliasBuilder[$viewName_single]))
{
$titles = array_values($this->customAliasBuilder[$viewName_single]);
}
else
elseif (isset($this->titleBuilder[$viewName_single]))
{
$titles = array($this->titleBuilder[$viewName_single]);
}
// reset the bucket
$titleData = array();
// load the dynamic title builder
if (isset($titles) && ComponentbuilderHelper::checkArray($titles))
{
foreach ($titles as $title)
{
$titleData[] = "\$this->" . $title;
}
}
else
{
$titleData = array("''"); // just incase some mad man does not set a title/customAlias (we fall back on the date)
}
// rest the new function
$newFunction = array();
$newFunction[] = PHP_EOL . PHP_EOL . "\t/**";

19
admin/tables/admin_fields.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableAdmin_fields extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->admin_view;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/admin_fields_conditions.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->admin_view;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_admin_views.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_admin_views extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_config.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_config extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_custom_admin_menus.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_custom_admin_views.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_dashboard.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_dashboard extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_files_folders.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_files_folders extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_mysql_tweaks.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_site_views.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_site_views extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/component_updates.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableComponent_updates extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->joomla_component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/custom_admin_view.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableCustom_admin_view extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/custom_code.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableCustom_code extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->component;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/dynamic_get.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableDynamic_get extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/field.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableField extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/fieldtype.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableFieldtype extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/joomla_component.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableJoomla_component extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->system_name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/language.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableLanguage extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/language_translation.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableLanguage_translation extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->source;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/library.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableLibrary extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/library_config.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableLibrary_config extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->library;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/library_files_folders_urls.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->library;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/server.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableServer extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/site_view.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableSite_view extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/snippet.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableSnippet extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/snippet_type.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableSnippet_type extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}

19
admin/tables/validation_rule.php
View File

@ -326,26 +326,13 @@ class ComponentbuilderTableValidation_rule extends JTable
}
/**
* Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving
* This view does not actually have an alias
*
* @return string
* @return bool
*/
public function generateAlias()
{
if (empty($this->alias))
{
$this->alias = $this->name;
}
$this->alias = JApplication::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '')
{
$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
}
return $this->alias;
return false;
}
}