fix patch

This commit is contained in:
Daniel Seifert 2020-02-25 09:15:52 +01:00
parent 5a83ed0f11
commit c7570b9167
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
2 changed files with 16 additions and 9 deletions

View File

@ -28,7 +28,7 @@
}, },
"patches": { "patches": {
"oxid-esales/oxideshop-ce": { "oxid-esales/oxideshop-ce": {
"add multi assignment to article attribute ajax template - 2020-02-24": "vendor/d3/attributemultivalues/patches/article_attribute_ajax.patch" "add multi assignment to article attribute ajax template - 2020-02-25": "vendor/d3/attributemultivalues/patches/article_attribute_ajax.patch"
} }
} }
}, },

View File

@ -1,7 +1,14 @@
diff --git "a/source/application/views/admin/tpl/popups/article_attribute.tpl" "b/source/application/views/admin/tpl/popups/article_attribute.tpl" From: Daniel Seifert <ds@shopmodule.com>
index 8c7f89f59..8debd4f08 100644 Date: Tue, 25 Feb 2020 09:11:32 +0100
--- "a/source/application/views/admin/tpl/popups/article_attribute.tpl"
+++ "b/source/application/views/admin/tpl/popups/article_attribute.tpl" ---
.../Application/views/admin/tpl/popups/article_attribute.tpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source/Application/views/admin/tpl/popups/article_attribute.tpl b/source/Application/views/admin/tpl/popups/article_attribute.tpl
index 30633272d..4563c3649 100644
--- a/source/Application/views/admin/tpl/popups/article_attribute.tpl
+++ b/source/Application/views/admin/tpl/popups/article_attribute.tpl
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
$('_attrname').innerHTML = oParam._oData._0; $('_attrname').innerHTML = oParam._oData._0;
$('attr_value').value = oParam._oData._2; $('attr_value').value = oParam._oData._2;
@ -14,16 +21,16 @@ index 8c7f89f59..8debd4f08 100644
failure: YAHOO.oxid.container2.onFailure, failure: YAHOO.oxid.container2.onFailure,
scope: YAHOO.oxid.container2 scope: YAHOO.oxid.container2
}; };
- YAHOO.util.Connect.asyncRequest( 'GET', '[{ $oViewConf->getAjaxLink() }]&cmpid=container2&container=article_attribute&fnc=saveAttributeValue&oxid=[{ $oxid }]&attr_value=' + encodeURIComponent( $('attr_value').value ) + '&attr_oxid=' + encodeURIComponent( $('attr_oxid').value ), callback ); - YAHOO.util.Connect.asyncRequest( 'GET', '[{$oViewConf->getAjaxLink()}]&cmpid=container2&container=article_attribute&fnc=saveAttributeValue&oxid=[{$oxid}]&attr_value=' + encodeURIComponent( $('attr_value').value ) + '&attr_oxid=' + encodeURIComponent( $('attr_oxid').value ), callback );
+ YAHOO.util.Connect.asyncRequest( 'GET', '[{ $oViewConf->getAjaxLink() }]&cmpid=container2&container=article_attribute&fnc=saveAttributeValue&oxid=[{ $oxid }]&attr_value=' + encodeURIComponent( $('attr_value').value ) + '&attr_oxid=' + encodeURIComponent( $('attr_oxid').value ) + '&o2attr_oxid=' + encodeURIComponent( $('o2attr_oxid').value ), callback ); [{*** d3 completed***}] + YAHOO.util.Connect.asyncRequest( 'GET', '[{$oViewConf->getAjaxLink()}]&cmpid=container2&container=article_attribute&fnc=saveAttributeValue&oxid=[{$oxid}]&attr_value=' + encodeURIComponent( $('attr_value').value ) + '&attr_oxid=' + encodeURIComponent( $('attr_oxid').value ) + '&o2attr_oxid=' + encodeURIComponent( $('o2attr_oxid').value ), callback ); [{*** d3 completed***}]
} }
// subscribint event listeners on buttons // subscribint event listeners on buttons
@@ -101,6 +102,7 @@ @@ -101,6 +102,7 @@
<td valign="top" align="center" class="edittext" id="arrt_conf" style="visibility:hidden"> <td valign="top" align="center" class="edittext" id="arrt_conf" style="visibility:hidden">
<br><br> <br><br>
<b id="_attrname">[{ $attr_name }]</b>:<br><br> <b id="_attrname">[{$attr_name}]</b>:<br><br>
+ <input id="o2attr_oxid" type="hidden"> [{*** d3 completed ***}] + <input id="o2attr_oxid" type="hidden"> [{*** d3 completed ***}]
<input id="attr_oxid" type="hidden"> <input id="attr_oxid" type="hidden">
<input id="attr_value" class="editinput" type="text"><br><br> <input id="attr_value" class="editinput" type="text"><br><br>
<input id="saveBtn" type="button" class="edittext" value="[{ oxmultilang ident="ARTICLE_ATTRIBUTE_SAVE" }]"> <input id="saveBtn" type="button" class="edittext" value="[{oxmultilang ident="ARTICLE_ATTRIBUTE_SAVE"}]">