joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

fixed import error with version is ignored.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-03-10 23:23:23 +02:00
parent 0c30fa7f68
commit 306b6b9787
1485 changed files with 244759 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/models/admin_view.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php

2
admin/models/admin_views.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.php

2
admin/models/ajax.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php

2
admin/models/compiler.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage compiler.php

2
admin/models/component.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.php

2
admin/models/componentbuilder.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

2
admin/models/components.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage components.php

2
admin/models/custom_admin_view.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.php

2
admin/models/custom_admin_views.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_views.php

2
admin/models/dynamic_get.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.php

2
admin/models/dynamic_gets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_gets.php

2
admin/models/field.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.php

2
admin/models/fields.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

2
admin/models/fields/adminviews.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

2
admin/models/fields/articles.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

2
admin/models/fields/customadminviews.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

2
admin/models/fields/customfilelist.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

2
admin/models/fields/customfolderlist.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

2
admin/models/fields/customgets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

2
admin/models/fields/dbtables.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

2
admin/models/fields/dynamicgets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

2
admin/models/fields/fields.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

2
admin/models/fields/fieldsmulti.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php

2
admin/models/fields/fieldtypes.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

2
admin/models/fields/maingets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

2
admin/models/fields/siteviews.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

2
admin/models/fields/snippets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

2
admin/models/fieldtype.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.php

2
admin/models/fieldtypes.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

2
admin/models/forms/admin_view.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.js

2
admin/models/forms/component.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.js

2
admin/models/forms/custom_admin_view.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.js

2
admin/models/forms/dynamic_get.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.js

2
admin/models/forms/field.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.js

2
admin/models/forms/fieldtype.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.js

2
admin/models/forms/help_document.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.js

2
admin/models/forms/layout.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.js

2
admin/models/forms/site_view.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.js

2
admin/models/forms/snippet.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.js

2
admin/models/forms/template.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.js

2
admin/models/help_document.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.php

2
admin/models/help_documents.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_documents.php

8
admin/models/import.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage import.php
@@ -509,7 +509,6 @@ class ComponentbuilderModelImport extends JModelLegacy
// reset all buckets
$query = $db->getQuery(true);
$fields = array();
$version = false;
// Fields to update.
foreach($row as $key => $cell)
{
@@ -532,7 +531,6 @@ class ComponentbuilderModelImport extends JModelLegacy
if ('version' == $target[$key])
{
$cell = (int) $version + 1;
$version = true;
}
// verify publish authority
if ('published' == $target[$key] && !$canState)
@@ -557,10 +555,6 @@ class ComponentbuilderModelImport extends JModelLegacy
// load the defaults
$fields[] = $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
$fields[] = $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
if (!$version)
{
$fields[] = $db->quoteName('version') . " = " . (int) $version + 1;
}
// Conditions for which records should be updated.
$conditions = array(
$db->quoteName('id') . ' = ' . $id

2
admin/models/layout.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.php

2
admin/models/layouts.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layouts.php

2
admin/models/site_view.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.php

2
admin/models/site_views.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_views.php

2
admin/models/snippet.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.php

2
admin/models/snippets.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

2
admin/models/template.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.php

2
admin/models/templates.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.php