Skip to content

Improved: Remove the multi-block attribute and the getJs requests (OFBIZ-13831) #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mridulpathak wants to merge 1 commit into
base: trunk
Choose a base branch
from
+42 −53
Open

Improved: Remove the multi-block attribute and the getJs requests (OFBIZ-13831) #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions UPGRADING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ upgrade.
are removed with the payment gateways ([#295](https://github.com/apache/ofbiz-plugins/pull/295)).
* The controller no longer declares the `http` view handler
([#426](https://github.com/apache/ofbiz-plugins/pull/426)).
* The `getJs` and `js` requests are removed with the `multi-block` script extraction
([OFBIZ-13831](https://issues.apache.org/jira/browse/OFBIZ-13831)). See the framework notes.

### example

Expand Down
13 changes: 0 additions & 13 deletions ecommerce/webapp/ecommerce/WEB-INF/controller.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,19 +168,6 @@ under the License.
<response name="success" type="none"/>
</request-map>

<!-- Support multi-block="true" in html-template tag -->
<request-map uri="getJs" method="get" track-serverhit="false">
<security https="false" auth="false"/>
<response name="success" type="request" value="js"/>
<response name="error" type="request" value="js"/>
</request-map>

<request-map uri="js">
<security https="false" auth="false" direct-request="false"/>
<event type="java" path="org.apache.ofbiz.common.CommonEvents" invoke="jsResponseFromRequest"/>
<response name="success" type="none"/>
</request-map>

<!-- open the corresponding FTL file with IDE when the named border is clicked from browser -->
<request-map uri="openSourceFile">
<security https="true" auth="true"/>
Expand Down
2 changes: 1 addition & 1 deletion ecommerce/widget/CartScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ under the License.
<include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/>
</decorator-section>
<decorator-section name="body">
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/cart/ShowCart.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/cart/ShowCart.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Expand Down
12 changes: 6 additions & 6 deletions ecommerce/widget/CatalogScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ under the License.
<script location="component://order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/ProductSummary.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductSummary.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down Expand Up @@ -226,7 +226,7 @@ under the License.
<set field="paginateEcommerceStyle" value="Y"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/CategoryDetail.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/CategoryDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down Expand Up @@ -299,7 +299,7 @@ under the License.
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/ProductDetail.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand All @@ -325,7 +325,7 @@ under the License.
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/ConfigProductDetail.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/ConfigProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down Expand Up @@ -379,7 +379,7 @@ under the License.
<screen name="detailImage">
<section>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/DetailImage.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/DetailImage.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down Expand Up @@ -564,7 +564,7 @@ under the License.
<script location="component://ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/ProductCategories.groovy"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/catalog/ProductCategories.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductCategories.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down
8 changes: 4 additions & 4 deletions ecommerce/widget/CommonScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ under the License.
</section>
<container id="div3" style="${bodyStyle} order-lg-2 order-1">
<!-- render messages -->
<platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
<decorator-section-include name="body"/>
</container>
<section>
Expand Down Expand Up @@ -293,7 +293,7 @@ under the License.
<widgets>
<platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
<platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>

<decorator-section-include name="body"/>

Expand Down Expand Up @@ -352,7 +352,7 @@ under the License.
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template multi-block="true" location="component://ecommerce/template/Login.ftl"/></html>
<html><html-template location="component://ecommerce/template/Login.ftl"/></html>
</platform-specific>
<platform-specific>
<html><html-template location="component://ecommerce/template/order/StartAnonCheckout.ftl"/></html>
Expand All @@ -373,7 +373,7 @@ under the License.
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template multi-block="true" location="component://ecommerce/template/RequirePasswordChange.ftl"/></html>
<html><html-template location="component://ecommerce/template/RequirePasswordChange.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Expand Down
4 changes: 2 additions & 2 deletions ecommerce/widget/CustomerScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/customer/profile/ManageAddress.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/customer/profile/ManageAddress.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Expand All @@ -659,7 +659,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/customer/AnonContactus.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/customer/AnonContactus.ftl"/></html></platform-specific>
</decorator-section>
<decorator-section name="right-column">
<include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion ecommerce/widget/EmailContactListScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/customer/MiniSignUpForContactList.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/customer/MiniSignUpForContactList.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down
2 changes: 1 addition & 1 deletion ecommerce/widget/EmailProductScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/email/TellAFriend.ftl"/></html></platform-specific>
<platform-specific><html><html-template location="component://ecommerce/template/email/TellAFriend.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Expand Down
Loading