Added the import method to custom import tab, and improved the import custom concept.
This commit is contained in:
parent
0fd9d9d169
commit
32e3f6b86e
16
README.md
16
README.md
@ -1,4 +1,4 @@
|
||||
# Component Builder (2.1.6)
|
||||
# Component Builder (2.1.7)
|
||||
|
||||
This is a [Joomla 3.x] (http://www.joomla.org/) component.
|
||||
|
||||
@ -33,31 +33,31 @@ Would you require more help VDM.io has a number of support plans available [visi
|
||||
+ *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
|
||||
+ *First Build*: 30th April, 2015
|
||||
+ *Last Build*: 4th May, 2016
|
||||
+ *Version*: 2.1.6
|
||||
+ *Version*: 2.1.7
|
||||
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
|
||||
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
||||
## Build Time
|
||||
|
||||
**227 Hours** or **28 Eight Hour Days** (actual time the author saved -
|
||||
**228 Hours** or **29 Eight Hour Days** (actual time the author saved -
|
||||
due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
|
||||
|
||||
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
|
||||
> never making one mistake or taking any coffee break.)
|
||||
|
||||
+ *Line count*: **81589**
|
||||
+ *File count*: **499**
|
||||
+ *Line count*: **81816**
|
||||
+ *File count*: **500**
|
||||
+ *Folder count*: **98**
|
||||
|
||||
**150 Hours** or **19 Eight Hour Days** (the actual time the author spent)
|
||||
**151 Hours** or **18 Eight Hour Days** (the actual time the author spent)
|
||||
|
||||
> (with the following break down:
|
||||
> **debugging @57hours** = codingtime / 4;
|
||||
> **planning @32hours** = codingtime / 7;
|
||||
> **planning @33hours** = codingtime / 7;
|
||||
> **mapping @23hours** = codingtime / 10;
|
||||
> **office @38hours** = codingtime / 6;)
|
||||
|
||||
**377 Hours** or **47 Eight Hour Days**
|
||||
**379 Hours** or **47 Eight Hour Days**
|
||||
(a total of the realistic time frame for this project)
|
||||
|
||||
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -9,7 +9,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -81,117 +81,7 @@ class ###Component###Model###View### extends JModelLegacy
|
||||
$this->safeFileOptions = array();
|
||||
parent::populateState();
|
||||
}
|
||||
|
||||
/**
|
||||
* Import an spreadsheet from either folder, url or upload.
|
||||
*
|
||||
* @return boolean result of import
|
||||
*
|
||||
*/
|
||||
public function import()
|
||||
{
|
||||
$this->setState('action', 'import');
|
||||
$app = JFactory::getApplication();
|
||||
$session = JFactory::getSession();
|
||||
$package = null;
|
||||
$continue = false;
|
||||
// get import type
|
||||
$this->getType = $app->input->getString('gettype', NULL);
|
||||
// get import type
|
||||
$this->dataType = $session->get('dataType_VDM_IMPORTINTO', NULL);
|
||||
|
||||
if ($package === null)
|
||||
{
|
||||
switch ($this->getType)
|
||||
{
|
||||
case 'folder':
|
||||
// Remember the 'Import from Directory' path.
|
||||
$app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory');
|
||||
$package = $this->_getPackageFromFolder();
|
||||
break;
|
||||
|
||||
case 'upload':
|
||||
$package = $this->_getPackageFromUpload();
|
||||
break;
|
||||
|
||||
case 'url':
|
||||
$package = $this->_getPackageFromUrl();
|
||||
break;
|
||||
|
||||
case 'continue':
|
||||
$continue = true;
|
||||
$package = $session->get('package', null);
|
||||
$package = json_decode($package, true);
|
||||
// clear session
|
||||
$session->clear('package');
|
||||
$session->clear('dataType');
|
||||
$session->clear('hasPackage');
|
||||
break;
|
||||
|
||||
default:
|
||||
$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));
|
||||
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Was the package valid?
|
||||
if (!$package || !$package['type'])
|
||||
{
|
||||
if (in_array($this->getType, array('upload', 'url')))
|
||||
{
|
||||
$this->remove($package['packagename']);
|
||||
}
|
||||
|
||||
$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
|
||||
return false;
|
||||
}
|
||||
|
||||
// first link data to table headers
|
||||
if(!$continue){
|
||||
$package = json_encode($package);
|
||||
$session->set('package', $package);
|
||||
$session->set('dataType', $this->dataType);
|
||||
$session->set('hasPackage', true);
|
||||
return true;
|
||||
}
|
||||
|
||||
// set the data
|
||||
$headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true);
|
||||
if (!$this->setData($package,$this->dataType,$headerList))
|
||||
{
|
||||
// There was an error importing the package
|
||||
$msg = JText::_('COM_###COMPONENT###_IMPORT_ERROR');
|
||||
$back = $session->get('backto_VDM_IMPORT', NULL);
|
||||
if ($back)
|
||||
{
|
||||
$app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
|
||||
$session->clear('backto_VDM_IMPORT');
|
||||
}
|
||||
$result = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Package imported sucessfully
|
||||
$msg = JText::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']);
|
||||
$back = $session->get('backto_VDM_IMPORT', NULL);
|
||||
if ($back)
|
||||
{
|
||||
$app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
|
||||
$session->clear('backto_VDM_IMPORT');
|
||||
}
|
||||
$result = true;
|
||||
}
|
||||
|
||||
// Set some model state values
|
||||
$app->enqueueMessage($msg);
|
||||
|
||||
// remove file after import
|
||||
$this->remove($package['packagename']);
|
||||
$session->clear($this->getType.'_VDM_IMPORTHEADERS');
|
||||
|
||||
return $result;
|
||||
}
|
||||
###IMPORT_METHOD_CUSTOM###
|
||||
|
||||
/**
|
||||
* Works out an importation spreadsheet from a HTTP upload
|
||||
@ -406,30 +296,8 @@ class ###Component###Model###View### extends JModelLegacy
|
||||
JFile::delete(JPath::clean($package));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the data from the spreadsheet to the database
|
||||
*
|
||||
* @param string $package Paths to the uploaded package file
|
||||
*
|
||||
* @return boolean false on failure
|
||||
*
|
||||
**/
|
||||
protected function setData($package,$table,$target_headers)
|
||||
{###IMPORT_SETDATE_METOD_CUSTOM###
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the data from the file to the database
|
||||
*
|
||||
* @param string $package Paths to the uploaded package file
|
||||
*
|
||||
* @return boolean false on failure
|
||||
*
|
||||
**/
|
||||
protected function save($data,$table)
|
||||
{###IMPORT_SAVE_METOD_CUSTOM###
|
||||
}
|
||||
###IMPORT_SETDATE_METHOD_CUSTOM###
|
||||
###IMPORT_SAVE_METHOD_CUSTOM###
|
||||
|
||||
protected function getAlias($name,$type = false)
|
||||
{
|
||||
|
@ -34,7 +34,6 @@ JHtml::_('bootstrap.tooltip');
|
||||
JHtml::_('script', 'system/core.js', false, true);
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
|
||||
<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>
|
||||
Joomla.continueImport = function()
|
||||
{
|
||||
@ -224,9 +223,7 @@ JHtml::_('script', 'system/core.js', false, true);
|
||||
<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" /> <small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<?php echo JHtml::_('bootstrap.endTab'); ?>
|
||||
|
||||
<?php echo JHtml::_('bootstrap.endTabSet'); ?>
|
||||
<input type="hidden" name="gettype" value="upload" />
|
||||
<?php endif; ?>
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -1089,7 +1089,7 @@ class Get
|
||||
// set custom import scripts
|
||||
if (isset($view->add_custom_import) && $view->add_custom_import == 1)
|
||||
{
|
||||
$addImportArray = array('php_import_setdata','php_import_save','html_import_view');
|
||||
$addImportArray = array('php_import','php_import_setdata','php_import_save','html_import_view');
|
||||
foreach ($addImportArray as $importScripter)
|
||||
{
|
||||
if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
|
||||
|
@ -6904,14 +6904,20 @@ class Interpretation extends Fields
|
||||
// load the custom script to the files
|
||||
if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
|
||||
{
|
||||
// ###IMPORT_SETDATE_METOD_CUSTOM### <<<DYNAMIC>>>
|
||||
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
|
||||
// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
|
||||
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
|
||||
unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
|
||||
}
|
||||
if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list]))
|
||||
{
|
||||
// ###IMPORT_METHOD_CUSTOM### <<<DYNAMIC>>>
|
||||
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]);
|
||||
unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]);
|
||||
}
|
||||
if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]))
|
||||
{
|
||||
// ###IMPORT_SAVE_METOD_CUSTOM### <<<DYNAMIC>>>
|
||||
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
|
||||
// ###IMPORT_SAVE_METHOD_CUSTOM### <<<DYNAMIC>>>
|
||||
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
|
||||
unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
|
||||
}
|
||||
if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]))
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -314,6 +314,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY="Php Getlistquery"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
|
||||
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT="// PHP Here that should run in the save Method, $data, $table"
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@ -36,7 +36,8 @@ $fields = $displayData->get('fields') ?: array(
|
||||
'add_custom_import',
|
||||
'html_import_view',
|
||||
'php_import_setdata',
|
||||
'php_import_save'
|
||||
'php_import_save',
|
||||
'php_import'
|
||||
);
|
||||
|
||||
?>
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@ -29,7 +29,7 @@
|
||||
defined('_JEXEC') or die('Restricted access');
|
||||
|
||||
// set the defaults
|
||||
$items = $displayData->vxdfields;
|
||||
$items = $displayData->vxefields;
|
||||
$user = JFactory::getUser();
|
||||
$id = $displayData->item->id;
|
||||
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
@ -10,7 +10,7 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.1.6
|
||||
@version 2.1.7
|
||||
@build 4th May, 2016
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user