Skip to content
Permalink
Browse files

Added an after cancel custom code area also in connection with gh-418

…in the admin view.
  • Loading branch information...
Llewellynvdm committed Jun 12, 2019
1 parent eae13df commit f03c6f52043ed92ae57a4896a3e715f73a2d90d6
Showing with 3,309 additions and 3,180 deletions.
  1. +5 −5 README.md
  2. +5 −5 admin/README.txt
  3. +1 −1 admin/compiler/joomla_3/JControllerForm.php
  4. +1 −1 admin/helpers/compiler/a_Get.php
  5. +3 −0 admin/helpers/compiler/f_Infusion.php
  6. +5 −0 admin/language/en-GB/en-GB.com_componentbuilder.ini
  7. +2 −0 admin/layouts/admin_view/php_fullwidth.php
  8. +1 −1 admin/layouts/fieldtype/fields_fullwidth.php
  9. +1 −1 admin/layouts/server/linked_components_fullwidth.php
  10. +114 −102 admin/models/admin_view.php
  11. +44 −42 admin/models/admin_views.php
  12. +6 −6 admin/models/fieldtype.php
  13. +190 −154 admin/models/forms/admin_view.js
  14. +649 −618 admin/models/forms/admin_view.xml
  15. +96 −96 admin/models/forms/custom_admin_view.js
  16. +38 −38 admin/models/forms/custom_code.js
  17. +454 −454 admin/models/forms/dynamic_get.js
  18. +133 −133 admin/models/forms/field.js
  19. +266 −266 admin/models/forms/fieldtype.js
  20. +77 −77 admin/models/forms/help_document.js
  21. +10 −10 admin/models/forms/layout.js
  22. +94 −94 admin/models/forms/library.js
  23. +169 −169 admin/models/forms/server.js
  24. +110 −110 admin/models/forms/site_view.js
  25. +10 −10 admin/models/forms/template.js
  26. +1 −1 admin/models/server.php
  27. +18 −15 admin/sql/install.mysql.utf8.sql
  28. +2 −2 admin/sql/updates/mysql/2.9.18.sql
  29. +3 −0 admin/sql/updates/mysql/2.9.19.sql
  30. +98 −83 admin/views/admin_view/tmpl/edit.php
  31. +46 −46 admin/views/admin_views/view.html.php
  32. +50 −50 admin/views/custom_admin_view/tmpl/edit.php
  33. +38 −38 admin/views/custom_code/tmpl/edit.php
  34. +154 −154 admin/views/dynamic_get/tmpl/edit.php
  35. +54 −54 admin/views/field/tmpl/edit.php
  36. +156 −156 admin/views/fieldtype/tmpl/edit.php
  37. +1 −1 admin/views/fieldtype/view.html.php
  38. +27 −27 admin/views/help_document/tmpl/edit.php
  39. +5 −5 admin/views/layout/tmpl/edit.php
  40. +20 −20 admin/views/library/tmpl/edit.php
  41. +66 −66 admin/views/server/tmpl/edit.php
  42. +1 −1 admin/views/server/view.html.php
  43. +55 −55 admin/views/site_view/tmpl/edit.php
  44. +5 −5 admin/views/template/tmpl/edit.php
  45. +2 −2 componentbuilder.xml
  46. +18 −1 componentbuilder_update_server.xml
  47. +5 −5 script.php
@@ -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.19) 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.20) 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)
@@ -147,12 +147,12 @@ TODO
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 12th June, 2019
+ *Version*: 2.9.19
+ *Version*: 2.9.20
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206728**
+ *Field count*: **1138**
+ *File count*: **1345**
+ *Line count*: **206854**
+ *Field count*: **1140**
+ *File count*: **1346**
+ *Folder count*: **209**

> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
@@ -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.19) 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.20) 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)

@@ -147,12 +147,12 @@ TODO
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 12th June, 2019
+ *Version*: 2.9.19
+ *Version*: 2.9.20
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206728**
+ *Field count*: **1138**
+ *File count*: **1345**
+ *Line count*: **206854**
+ *Field count*: **1140**
+ *File count*: **1346**
+ *Folder count*: **209**

> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
@@ -177,7 +177,7 @@ public function cancel($key = null)
'index.php?option=' . $this->option . $redirect, false
)
);
}
}###JCONTROLLERFORM_AFTERCANCEL###

This comment has been minimized.

Copy link
@Llewellynvdm

Llewellynvdm Jun 12, 2019

Author Member

@peterpetrov so now we have both before and after...

This comment has been minimized.

Copy link
@peterpetrov

peterpetrov Jun 12, 2019

Thanks, that will help a lot!

return $cancel;
}

@@ -2046,7 +2046,7 @@ public function getAdminViewData($id)
}
}
// add_php
$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', 'php_after_cancel', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
foreach ($addArrayP as $scripter)
{
if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)
@@ -534,6 +534,9 @@ protected function buildFileContent()
// JCONTROLLERFORM_BEFORECANCEL <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_BEFORECANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_before_cancel', $viewName_single, PHP_EOL, null, null, '');
// JCONTROLLERFORM_AFTERCANCEL <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_AFTERCANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_after_cancel', $viewName_single, PHP_EOL, null, null, '');
// JCONTROLLERFORM_ALLOWEDIT <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_ALLOWEDIT' . $this->hhh] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
@@ -493,6 +493,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON="Add New Button"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON="Add New & Close Button"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON="Add New + New & Close Button"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL="Add Php After Cancel"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL_LABEL="Add PHP (script - after cancel)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE="Add Php After Delete"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL="Add PHP (script - after delete)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
@@ -971,6 +973,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL="Php After Cancel"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_DESCRIPTION="Add PHP Here that should run in the Cancel Method after cancel. Do not add the php tags."
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_LABEL="PHP Cancel Method after<br /><small>(string) $key is the name of the primary key of the URL variable.</small>"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method after items were deleted. Do not add the php tags."
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP delete Method after<br /><small>Target (array) $pks is an array of record primary keys.</small>"
@@ -40,6 +40,8 @@
'php_allowedit',
'add_php_before_cancel',
'php_before_cancel',
'add_php_after_cancel',
'php_after_cancel',
'add_php_batchcopy',
'php_batchcopy',
'add_php_batchmove',
@@ -13,7 +13,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->waqfields;
$items = $displayData->warfields;
$user = JFactory::getUser();
$id = $displayData->item->id;
// set the edit URL
@@ -13,7 +13,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->wbalinked_components;
$items = $displayData->wbblinked_components;
$user = JFactory::getUser();
$id = $displayData->item->id;
// set the edit URL

0 comments on commit f03c6f5

Please sign in to comment.
You can’t perform that action at this time.