joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests Projects 4 Wiki Activity

Improved the lockdown WHMCS license integration

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-11-22 19:08:17 +02:00
parent 319944db68
commit 082196378b
42 changed files with 2184 additions and 2111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin/models/admin_view.php
View File

@ -285,7 +285,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getVxpfields()
public function getVxqfields()
{
// Get the user object.
$user = JFactory::getUser();
@ -354,13 +354,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
$item->datatype = $this->selectionTranslationVxpfields($item->datatype, 'datatype');
$item->datatype = $this->selectionTranslationVxqfields($item->datatype, 'datatype');
// convert indexes
$item->indexes = $this->selectionTranslationVxpfields($item->indexes, 'indexes');
$item->indexes = $this->selectionTranslationVxqfields($item->indexes, 'indexes');
// convert null_switch
$item->null_switch = $this->selectionTranslationVxpfields($item->null_switch, 'null_switch');
$item->null_switch = $this->selectionTranslationVxqfields($item->null_switch, 'null_switch');
// convert store
$item->store = $this->selectionTranslationVxpfields($item->store, 'store');
$item->store = $this->selectionTranslationVxqfields($item->store, 'store');
}
}
@ -395,7 +395,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
*
* @return translatable string
*/
public function selectionTranslationVxpfields($value,$name)
public function selectionTranslationVxqfields($value,$name)
{
// Array of datatype language strings
if ($name == 'datatype')
@ -479,7 +479,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
* @since 1.6
*/
public function getForm($data = array(), $loadData = true)
{ // Get the form.
{
// Get the form.
$form = $this->loadForm('com_componentbuilder.admin_view', 'admin_view', array('control' => 'jform', 'load_data' => $loadData));
if (empty($form))