From d6f77aa42f7980ba002c71f00034dee40764f4b9 Mon Sep 17 00:00:00 2001 From: Steffen Allner Date: Mon, 1 Oct 2018 15:22:42 +0200 Subject: [PATCH] Fix action extraction for addItem. This resulted in a malformed from action as the splitting was done too early as `add` was also included in `manage_addProduct`. This occurred with `Products.ZSQLMethod` as the add method name is very generic. --- CHANGES.rst | 2 +- src/zmi/styles/resources/zmi_base.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a28c7f7a61..2412a02f92 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -26,7 +26,7 @@ Bugfixes native ``str`` on both Python versions. (`#265 `_) -- Inlcude the ``zmi.styles`` repository in this package to break a circular +- Include the ``zmi.styles`` repository in this package to break a circular dependency. (`#307 `_) diff --git a/src/zmi/styles/resources/zmi_base.js b/src/zmi/styles/resources/zmi_base.js index 8b6b65ff48..8857b2e51c 100644 --- a/src/zmi/styles/resources/zmi_base.js +++ b/src/zmi/styles/resources/zmi_base.js @@ -13,10 +13,15 @@ function toggle_menu() { // [2] Add New Object Item (with Modal Dialog) function addItem( elm, base_url ) { + // e.g. manage_addProduct/OFSP/folderAdd var url_action = elm.options[elm.selectedIndex].value; + // http://localhost/myfolder/manage_addProduct/OFSP/folderAdd var url_full = base_url + '/' + url_action; - var action = url_action.split('/')[url_action.split('/').length-1]; - var modal_form_base = url_full.split(action)[0]; + var parts = url_action.split('/'); + // folderAdd + var action = parts[parts.length-1]; + // http://localhost/myfolder/manage_addProduct/OFSP/ + var modal_form_base = url_full.slice(0, -action.length); var modal_body_url = url_full + '?zmi_dialog=modal'; // List of Object Types Inserting Without Modal Dialog