You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/07/03 21:42:46 UTC
svn commit: r1356888 [2/5] - in /ofbiz/branches/20120329_portletWidget:
applications/accounting/ applications/commonext/ applications/content/
applications/content/data/ applications/content/template/survey/
applications/content/testdef/data/ applicati...
Modified: ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml Tue Jul 3 19:42:32 2012
@@ -2009,6 +2009,22 @@
<value xml:lang="zh">å·²æ¹åç产åéæ±</value>
<value xml:lang="zh_TW">å·²æ¹åçç¢åéæ±</value>
</property>
+ <property key="OrderAssignItems">
+ <value xml:lang="da">Tildel emne</value>
+ <value xml:lang="en">Assign Items</value>
+ <value xml:lang="es">Asignar Ãtems</value>
+ <value xml:lang="fr">Affecter les articles</value>
+ <value xml:lang="it">Assegna articoli</value>
+ <value xml:lang="ja">Assign Items</value>
+ <value xml:lang="nl">Wijs items toe</value>
+ <value xml:lang="pt_BR">Atribuir itens</value>
+ <value xml:lang="ro">Atribuie Linii</value>
+ <value xml:lang="ru">ÐазнаÑиÑÑ Ð¿Ð¾Ð·Ð¸ÑиÑ</value>
+ <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
+ <value xml:lang="vi">Các mục Äược nhượng lại</value>
+ <value xml:lang="zh">åé
æç»</value>
+ <value xml:lang="zh_TW">åé
æç´°</value>
+ </property>
<property key="OrderAssociatedProducts">
<value xml:lang="de">Authentifizierungsservice</value>
<value xml:lang="en">Associated Products</value>
@@ -13984,6 +14000,23 @@
<value xml:lang="zh">æ¾ç¤ºä¿é详ç»ä¿¡æ¯</value>
<value xml:lang="zh_TW">顯示ä¿é·è©³ç´°è³è¨</value>
</property>
+ <property key="PageTitleSplitItemsForShipping">
+ <value xml:lang="da">Opdel varer til forsendelse</value>
+ <value xml:lang="de">Positionen aufteilen für Versand</value>
+ <value xml:lang="en">Split Items For Shipping</value>
+ <value xml:lang="es">Dividir ArtÃculos para envÃo</value>
+ <value xml:lang="fr">Dissocier les articles lors de l'expédition</value>
+ <value xml:lang="it">Dividi gli articoli per spedizioni</value>
+ <value xml:lang="ja">Split Items For Shipping</value>
+ <value xml:lang="nl">Splits items op voor verzending</value>
+ <value xml:lang="pt_BR">Dividir itens em grupos para o envio</value>
+ <value xml:lang="ro">Divide linii pe expedieri </value>
+ <value xml:lang="ru">РазделиÑÑ Ð¿Ð¾Ð·Ð¸Ñии Ð´Ð»Ñ Ð´Ð¾ÑÑавки</value>
+ <value xml:lang="th">à¹à¸¢à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸</value>
+ <value xml:lang="vi">Phân chia danh mục sản phẩm Äá» váºn chuyá»n</value>
+ <value xml:lang="zh">为éè´§åææç»</value>
+ <value xml:lang="zh_TW">çºé貨åææç´°</value>
+ </property>
<property key="PageTitleViewRequest">
<value xml:lang="de">Anfrage anzeigen</value>
<value xml:lang="en">View Request</value>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -34,7 +34,8 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy Tue Jul 3 19:42:32 2012
@@ -53,7 +53,7 @@ carrierShipmentMethods = delegator.findL
context.carrierShipmentMethods = carrierShipmentMethods;
// get the Payment Status
-paymentStatusList = delegator.findByAnd("StatusItem", [statusTypeId : "PAYMENT_PREF_STATUS"], ["description"]);
+paymentStatusList = delegator.findByAnd("StatusItem", [statusTypeId : "PAYMENT_PREF_STATUS"], ["description"], false);
context.paymentStatusList = paymentStatusList;
// current role type
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Jul 3 19:42:32 2012
@@ -1904,6 +1904,31 @@ under the License.
<security auth="true" https="true"/>
<response name="success" type="view" value="EditQuoteTermItem" save-last-view="true"/>
</request-map>
+
+ <!-- Split Shipment Requests -->
+ <request-map uri="splitship">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="splitship"/>
+ </request-map>
+ <request-map uri="updatesplit">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="assignItemShipGroup"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="view" value="splitship"/>
+ </request-map>
+ <request-map uri="updateShippingAddress">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setCartShippingAddress"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="request" value="splitship"/>
+ </request-map>
+ <request-map uri="updateShippingOptions">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setCartShippingOptions"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="request" value="splitship"/>
+ </request-map>
+
<!--
These are just examples of reports developed using JasperReport and not really
useful reports. In order to run them you'll have to follow the notes in the
@@ -2113,5 +2138,7 @@ under the License.
<view-map name="EditQuoteTerm" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#EditQuoteTerm"/>
<view-map name="EditQuoteTermItem" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#EditQuoteTermItem"/>
<view-map name="ListQuoteTerms" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#ListQuoteTerms"/>
+
+ <view-map name="splitship" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#splitship"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/optionsettings.ftl Tue Jul 3 19:42:32 2012
@@ -184,8 +184,8 @@ under the License.
<td colspan="2">
<div>
<span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span>
- <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span class="tabletext">${uiLabelMap.CommonYes}</span>
- <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span class="tabletext">${uiLabelMap.CommonNo}</span>
+ <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span>
+ <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span>
</div>
</td>
</tr>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jul 3 19:42:32 2012
@@ -252,7 +252,7 @@ under the License.
-->
<select name="shipmentMethod">
<#if shipGroup.shipmentMethodTypeId?has_content>
- <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
+ <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
<#else>
<option value=""/>
</#if>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryForms.xml Tue Jul 3 19:42:32 2012
@@ -19,7 +19,7 @@ under the License.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="FindRequirements" type="single" target="RequirementsForSupplier" title=""
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ default-title-style="tableheadtext">
<field name="showList"><hidden value="Y"/></field>
<field name="requirementId"><text-find/></field>
<field name="partyId" title="${uiLabelMap.PartySupplier}"><lookup target-form-name="LookupPartyName"/></field>
@@ -28,7 +28,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="RequirementsList" type="multi" use-row-submit="true" target="addRequirementsToCart" title="" list-name="requirementsForSupplier"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
+ default-title-style="tableheadtext"
paginate-target="RequirementsForSupplier">
<actions>
<service service-name="prepareFind" result-map="resultConditions">
@@ -75,7 +75,7 @@ under the License.
</field>
</form>
<form name="ListQuotes" list-name="listIt" target="" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
+ default-title-style="tableheadtext"
paginate-target="FindQuoteForCart">
<actions>
<set field="entityName" value="Quote"/>
@@ -105,7 +105,7 @@ under the License.
<field name="currencyUomId"><hidden/></field>
</form>
<form name="ViewShoppingLists" type="list" list-name="customershoppinglists" target=""
- default-title-style="tableheadtext" default-widget-style="tabletext">
+ default-title-style="tableheadtext">
<field name="listName" title="${uiLabelMap.PageTitleShoppingList}"><display/></field>
<field name="shoppingListTypeId" title="${uiLabelMap.OrderListType}">
<display-entity entity-name="ShoppingListType"/>
@@ -123,7 +123,7 @@ under the License.
</field>
</form>
<form name="AddFromShoppingList" type="list" list-name="shoppinglistitems" target=""
- default-title-style="tableheadtext" default-widget-style="tabletext">
+ default-title-style="tableheadtext">
<auto-fields-entity entity-name="ShoppingListItem" default-field-type="display"/>
<field name="productId" title="${uiLabelMap.ProductProduct}">
<display-entity entity-name="Product" description="${productId} - ${description}"/>
@@ -205,7 +205,7 @@ under the License.
</field>
</form>
<form name="LookupAssociatedProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
- paginate-target="LookupAssociatedProducts" default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ paginate-target="LookupAssociatedProducts" default-title-style="tableheadtext" default-widget-style="inputBox">
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
</field>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Tue Jul 3 19:42:32 2012
@@ -318,4 +318,19 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="splitship">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/SplitShip.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/PartySettingsForm.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/PartySettingsForm.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/PartySettingsForm.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/PartySettingsForm.xml Tue Jul 3 19:42:32 2012
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="quickAddOptionalParty" target="addOptionalParty" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ default-title-style="tableheadtext" default-widget-style="inputBox">
<field name="optionalPartyId" title="${uiLabelMap.PartyPartyId}">
<lookup target-form-name="LookupPerson"/>
</field>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteScreens.xml Tue Jul 3 19:42:32 2012
@@ -642,7 +642,7 @@ under the License.
<not><if-empty field="quote"/></not>
</condition>
<widgets>
- <label text="${note}" style="tabletext"/>
+ <label text="${note}"/>
<include-screen name="ViewQuoteInfo"/>
<container style="clear"/>
<include-screen name="ViewQuoteItemInfo"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Tue Jul 3 19:42:32 2012
@@ -59,9 +59,9 @@ under the License.
</field>
<sort-order>
<sort-field name="quoteId"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortId}"/>
+ <banner left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortId}"/>
<sort-field name="workEffortId"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortIdNew}"/>
+ <banner left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortIdNew}"/>
</sort-order>
</form>
Modified: ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/PartySecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Tue Jul 3 19:42:32 2012
@@ -58,9 +58,9 @@ under the License.
</#list>
<#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
<#if contactMechMap.postalAddress?has_content>
- <#assign postalAddress = contactMechMap.postalAddress>
- ${setContextField("postalAddress", postalAddress)}
- ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
+ <#assign postalAddress = contactMechMap.postalAddress>
+ ${setContextField("postalAddress", postalAddress)}
+ ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
<#if postalAddress.geoPointId?has_content>
<#if contactMechPurposeType?has_content>
<#assign popUptitle = contactMechPurposeType.get("description", locale) + uiLabelMap.CommonGeoLocation>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -37,7 +37,10 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -29,9 +29,10 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/TimesheetScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/TimesheetScreens.xml Tue Jul 3 19:42:32 2012
@@ -78,9 +78,9 @@ under the License.
</actions>
<widgets>
<container>
- <label style="tabletext" text="${uiLabelMap.WorkEffortTimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
+ <label text="${uiLabelMap.WorkEffortTimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
<label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.WorkEffortTimesheetHours} "/>
- <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
+ <label text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
<section>
<condition><not><if-empty field="currentTimeEntry.workEffortId"/></not></condition>
<widgets>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortCommEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortCommEventForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortCommEventForms.xml Tue Jul 3 19:42:32 2012
@@ -56,10 +56,10 @@ under the License.
<field name="communicationEventId"><lookup target-form-name="LookupCommEvent"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field>
<sort-order>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner3}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBanner3}"/>
<sort-field name="workEffortId"/>
<sort-field name="communicationEventId"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner4}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBanner4}"/>
<sort-field name="description"/>
</sort-order>
</form>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortForms.xml Tue Jul 3 19:42:32 2012
@@ -308,9 +308,9 @@ under the License.
<sort-field name="sequenceNum"/>
<sort-field name="fromDate"/>
<sort-field name="thruDate"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBannerAddWorkEffortAndAssoc1}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBannerAddWorkEffortAndAssoc1}"/>
<sort-field name="workEffortIdTo"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBannerAddWorkEffortAndAssoc2}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBannerAddWorkEffortAndAssoc2}"/>
<sort-field name="workEffortName"/>
<sort-field name="description"/>
</sort-order>
@@ -685,7 +685,7 @@ under the License.
<field map-name="subjectMap" name="subject"><text size="30"/></field>
</form>
- <form name="ListPreferredContactMech" default-widget-style="tabletext" target="" title="" type="list"
+ <form name="ListPreferredContactMech" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="PartyAndContactMech">
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortRequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortRequirementForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortRequirementForms.xml Tue Jul 3 19:42:32 2012
@@ -57,9 +57,9 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<sort-order>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner5}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBanner5}"/>
<sort-field name="requirementId"/>
- <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner6}"/>
+ <banner left-text="${uiLabelMap.WorkEffortBanner6}"/>
<sort-field name="workReqFulfTypeId"/>
</sort-order>
</form>
Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ObjectType.java Tue Jul 3 19:42:32 2012
@@ -471,7 +471,7 @@ public class ObjectType {
@SourceMonitored
@SuppressWarnings("unchecked")
public static Object simpleTypeConvert(Object obj, String type, String format, TimeZone timeZone, Locale locale, boolean noTypeFail) throws GeneralException {
- if (obj == null || type == null || "Object".equals(type) || "java.lang.Object".equals(type)) {
+ if (obj == null || UtilValidate.isEmpty(type) || "Object".equals(type) || "java.lang.Object".equals(type)) {
return obj;
}
if ("PlainString".equals(type)) {
Modified: ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -25,7 +25,8 @@ under the License.
<classpath type="dir" location="config"/>
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/BiSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -27,7 +27,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/>
<entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml Tue Jul 3 19:42:32 2012
@@ -207,7 +207,8 @@ under the License.
<!-- Lookup requests -->
<request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
<request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map>
-
+ <request-map uri="LookupLocale"><security https="true" auth="true"/><response name="success" type="view" value="LookupLocale"/></request-map>
+
<!--========================== AJAX events =====================-->
<!-- Get states related to a country -->
<request-map uri="getAssociatedStateList">
@@ -279,4 +280,5 @@ under the License.
<view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/>
<view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/>
+ <view-map name="LookupLocale" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocale"/>
</site-conf>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/portal/listPortalPortlets.ftl Tue Jul 3 19:42:32 2012
@@ -39,10 +39,10 @@ under the License.
<div class="h3">
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
</div>
- <div class="tabletext">
+ <div>
${portalPortlet.description?if_exists}
</div>
- <div class="tabletext">
+ <div>
${parameters.portletCategoryId}
</div>
</td>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml Tue Jul 3 19:42:32 2012
@@ -103,7 +103,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonExtHelpTitle}" navigation-menu-name="lookupMenu">
<include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/>
- <iterate-section entry="contentAssoc" list="contentAssocs" view-size="10">
+ <iterate-section entry="contentAssoc" list="contentAssocs">
<section>
<actions>
<set field="contentId" from-field="contentAssoc.contentIdTo"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml Tue Jul 3 19:42:32 2012
@@ -115,4 +115,17 @@ under the License.
</field>
</form>
+ <form name="LookupLocale" type="single" target="LookupLocale">
+ <field name="localeString"><text-find hide-options="true"/></field>
+ <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find hide-options="true"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="localeString" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/>
+ </field>
+ <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field>
+ </form>
</forms>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml Tue Jul 3 19:42:32 2012
@@ -225,4 +225,28 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="LookupLocale">
+ <section>
+ <actions>
+ <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.CommonLookupLocale}"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="inputFields" from-field="parameters"/>
+ <script location="component://common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupLocale" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListLocales" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml Tue Jul 3 19:42:32 2012
@@ -62,7 +62,7 @@ under the License.
</hyperlink>
</field>
<field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}"><display/></field>
- <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext">
+ <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName">
<display>
<in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
<simple-editor/>
@@ -70,8 +70,8 @@ under the License.
</in-place-editor>
</display>
</field>
- <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" widget-style="tabletext"><display/></field>
- <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" widget-style="tabletext">
+ <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}"><display/></field>
+ <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription">
<display>
<in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
<simple-editor/>
Modified: ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml Tue Jul 3 19:42:32 2012
@@ -100,7 +100,6 @@ access. For a detailed description see t
<!-- defining:
tenant = OFBiz and External Tenant Data
seed = OFBiz and External Seed Data - to be maintained along with source and updated whenever a system deployment is updated
- security = OFBiz security group and security permissions. are required to show a component.
seed-initial = OFBiz and External Seed Data - to be maintained along with source like other seed data, but only loaded initially and not updated when a system is updated except manually reviewing each line
demo = OFBiz Only Demo Data
ext = External General Data (custom)
@@ -109,7 +108,6 @@ access. For a detailed description see t
-->
<entity-data-reader name="tenant"/>
<entity-data-reader name="seed"/>
- <entity-data-reader name="security"/>
<entity-data-reader name="seed-initial"/>
<entity-data-reader name="demo"/>
<entity-data-reader name="ext"/>
@@ -157,7 +155,6 @@ access. For a detailed description see t
alias-view-columns="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -187,7 +184,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -238,7 +234,6 @@ access. For a detailed description see t
<!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index -->
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -265,7 +260,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -289,7 +283,6 @@ access. For a detailed description see t
add-missing-on-start="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -315,7 +308,6 @@ access. For a detailed description see t
use-pk-constraint-names="false">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -345,7 +337,6 @@ access. For a detailed description see t
collate="latin1_general_cs">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -377,7 +368,6 @@ access. For a detailed description see t
collate="latin1_general_cs">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -409,7 +399,6 @@ access. For a detailed description see t
collate="latin1_general_cs">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -441,7 +430,6 @@ access. For a detailed description see t
collate="latin1_general_cs">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<inline-jdbc
jdbc-driver="com.mysql.jdbc.Driver"
jdbc-uri="jdbc:mysql://127.0.0.1/ofbiz_odbc?autoReconnect=true"
@@ -470,7 +458,6 @@ access. For a detailed description see t
-->
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -509,7 +496,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -544,7 +530,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -579,7 +564,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -612,7 +596,6 @@ access. For a detailed description see t
use-order-by-nulls="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -654,7 +637,6 @@ access. For a detailed description see t
join-style="ansi">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -679,7 +661,6 @@ access. For a detailed description see t
join-style="ansi-no-parenthesis">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -708,7 +689,6 @@ access. For a detailed description see t
join-style="ansi">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -752,7 +732,6 @@ access. For a detailed description see t
use-fk-initially-deferred="false">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -777,7 +756,6 @@ access. For a detailed description see t
join-style="ansi">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
@@ -806,7 +784,6 @@ access. For a detailed description see t
always-use-constraint-keyword="true">
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
- <read-data reader-name="security"/>
<read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -29,8 +29,15 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtTypeData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EntityExtSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="group" loader="main" location="servicedef/groups.xml"/>
+
+ <!-- load the data load container, runs the entity data load stuff -->
+ <container name="dataload-container" loaders="install" class="org.ofbiz.entityext.data.EntityDataLoadContainer">
+ <property name="delegator-name" value="default"/>
+ <property name="entity-group-name" value="org.ofbiz"/>
+ </container>
</ofbiz-component>
Modified: ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -26,8 +26,8 @@ under the License.
<classpath type="dir" location="dtd"/>
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityPermissionSeedData.xml"/>
<!-- NOTE: comment this line out to ensure no resetting of passwords -->
<entity-resource type="data" reader-name="demo" loader="main" location="data/PasswordSecurityData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/SecurityDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/SecurityGroupDemoData.xml"/>
</ofbiz-component>
Modified: ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -31,7 +31,8 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/ScheduledServiceData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSeedData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Tue Jul 3 19:42:32 2012
@@ -39,18 +39,16 @@ import javolution.util.FastList;
import javolution.util.FastMap;
import org.ofbiz.base.component.ComponentConfig;
-import org.ofbiz.base.container.ContainerConfig;
-import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.KeyStoreUtil;
import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.StringUtil.StringWrapper;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.StringUtil.StringWrapper;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
import org.ofbiz.entity.GenericEntityException;
@@ -447,7 +445,7 @@ public class LoginWorker {
if (setupNewDelegatorEtc) {
// now set the delegator and dispatcher in a bunch of places just in case they were changed
- setWebContextObjects(request, response, delegator, dispatcher, true);
+ setWebContextObjects(request, response, delegator, dispatcher);
}
// check to see if a password change is required for the user
@@ -477,47 +475,28 @@ public class LoginWorker {
}
}
- /* persistSerialized is set at false in the context of a cluster when using (at least) DeltaManager.
- Because we have no easy ways to set DeltaManager.pathname to null from OFBiz
- So persistSerialized is set to true when login out. This prevent a NPE due to non serialized objects put in session*/
- private static void setWebContextObjects(HttpServletRequest request, HttpServletResponse response, Delegator delegator, LocalDispatcher dispatcher, Boolean persistSerialized) {
+ private static void setWebContextObjects(HttpServletRequest request, HttpServletResponse response, Delegator delegator, LocalDispatcher dispatcher) {
HttpSession session = request.getSession();
+ // NOTE: we do NOT want to set this in the servletContext, only in the request and session
+ // We also need to setup the security and authz objects since they are dependent on the delegator
+ Security security = null;
+ try {
+ security = SecurityFactory.getInstance(delegator);
+ } catch (SecurityConfigurationException e) {
+ Debug.logError(e, module);
+ }
+ Authorization authz = null;
+ try {
+ authz = AuthorizationFactory.getInstance(delegator);
+ } catch (SecurityConfigurationException e) {
+ Debug.logError(e, module);
+ }
- // NOTE: we do NOT want to set this in the servletContet, only in the request and session
session.setAttribute("delegatorName", delegator.getDelegatorName());
-
request.setAttribute("delegator", delegator);
- if (!persistSerialized) {
- session.setAttribute("delegator", null);
- } else {
- session.setAttribute("delegator", delegator);
- }
-
request.setAttribute("dispatcher", dispatcher);
- if (!persistSerialized) {
- session.setAttribute("dispatcher", null);
- } else {
- session.setAttribute("dispatcher", dispatcher);
- }
-
- if (persistSerialized) {
- // we also need to setup the security and authz objects since they are dependent on the delegator
- try {
- Security security = SecurityFactory.getInstance(delegator);
- request.setAttribute("security", security);
- session.setAttribute("security", security);
- } catch (SecurityConfigurationException e) {
- Debug.logError(e, module);
- }
-
- try {
- Authorization authz = AuthorizationFactory.getInstance(delegator);
- request.setAttribute("authz", authz);
- session.setAttribute("authz", authz);
- } catch (SecurityConfigurationException e) {
- Debug.logError(e, module);
- }
- }
+ request.setAttribute("security", security);
+ request.setAttribute("authz", authz);
// get rid of the visit info since it was pointing to the previous database, and get a new one
session.removeAttribute("visitor");
@@ -652,22 +631,7 @@ public class LoginWorker {
delegator = DelegatorFactory.getDelegator(delegatorName);
LocalDispatcher dispatcher = ContextFilter.makeWebappDispatcher(session.getServletContext(), delegator);
- // get the container configuration
- String ofbizHome = System.getProperty("ofbiz.home");
- String configFile = ofbizHome + "/framework/base/config/ofbiz-containers.xml";
- ContainerConfig.Container cc = null;
- String mgrClassName = null;
- try {
- cc = ContainerConfig.getContainer("catalina-container", configFile);
- mgrClassName = ContainerConfig.getPropertyValue(cc, "manager-class", "");
- } catch (ContainerException e) {
- Debug.logError(e, "No catalina-container configuration found in container config!");
- }
- if ("org.apache.catalina.ha.session.DeltaManager".equals(mgrClassName)) {
- setWebContextObjects(request, response, delegator, dispatcher, false);
- } else {
- setWebContextObjects(request, response, delegator, dispatcher, true);
- }
+ setWebContextObjects(request, response, delegator, dispatcher);
}
// DON'T save the cart, causes too many problems: if (shoppingCart != null) session.setAttribute("shoppingCart", new WebShoppingCart(shoppingCart, session));
@@ -981,7 +945,7 @@ public class LoginWorker {
if (!oldDelegatorName.equals(userLogin.getDelegator().getDelegatorName())) {
delegator = DelegatorFactory.getDelegator(userLogin.getDelegator().getDelegatorName());
dispatcher = ContextFilter.makeWebappDispatcher(servletContext, delegator);
- setWebContextObjects(request, response, delegator, dispatcher, true);
+ setWebContextObjects(request, response, delegator, dispatcher);
}
// found userLogin, do the external login...
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -24,7 +24,8 @@ under the License.
<resource-loader name="main" type="component"/>
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WebtoolsSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<webapp name="webtools"
title="WebTools"
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Tue Jul 3 19:42:32 2012
@@ -139,7 +139,7 @@ function ShowTab(lname) {
<#if field.fieldType == 'DateTime'>
DateTime(YYYY-MM-DD HH:mm:SS.sss):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#elseif field.fieldType == 'Date'>
- Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#elseif field.fieldType == 'Time'>
Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Integer'>
@@ -179,7 +179,7 @@ function ShowTab(lname) {
<#if field.fieldType == 'DateTime'>
DateTime(YYYY-MM-DD HH:mm:SS.sss):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#elseif field.fieldType == 'Date'>
- Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#elseif field.fieldType == 'Time'>
Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Integer'>
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/xmldsdump.jsp
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/xmldsdump.jsp?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/xmldsdump.jsp (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/xmldsdump.jsp Tue Jul 3 19:42:32 2012
@@ -186,12 +186,12 @@ under the License.
session.setAttribute("entityDateCond", entityDateCond);
%>
<div class="head1">XML Export from DataSource(s)</div>
- <div class="tabletext">This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div>
+ <div>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div>
<hr/>
<%if(security.hasPermission("ENTITY_MAINT", session)) {%>
<a href="<ofbiz:url>/xmldsrawdump</ofbiz:url>" class="buttontext" target="_blank">Click Here to Get Data (or save to file)</a>
<%} else {%>
- <div class="tabletext">You do not have permission to use this page (ENTITY_MAINT needed)</div>
+ <div>You do not have permission to use this page (ENTITY_MAINT needed)</div>
<%}%>
<%} else {%>
<%
@@ -335,47 +335,47 @@ under the License.
%>
<div class="head1">XML Export from DataSource(s)</div>
- <div class="tabletext">This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div>
+ <div>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div>
<hr/>
<%if(security.hasPermission("ENTITY_MAINT", session)) {%>
<div class="head2">Results:</div>
<%if(filename != null && filename.length() > 0 && numberOfEntities > 0) {%>
- <div class="tabletext">Wrote XML for all data in <%=numberOfEntities%> entities.</div>
- <div class="tabletext">Wrote <%=numberWritten%> records to XML file <%=filename%></div>
+ <div>Wrote XML for all data in <%=numberOfEntities%> entities.</div>
+ <div>Wrote <%=numberWritten%> records to XML file <%=filename%></div>
<%} else if (outpath != null && numberOfEntities > 0) {%>
<%Iterator re = results.iterator();%>
<%while (re.hasNext()){%>
- <div class="tabletext"><%=(String)re.next()%> </div>
+ <div><%=(String)re.next()%> </div>
<%}%>
<%} else {%>
- <div class="tabletext">No filename specified or no entity names specified, doing nothing.</div>
+ <div>No filename specified or no entity names specified, doing nothing.</div>
<%}%>
<hr/>
<div class="head2">Export:</div>
<form method="post" action="<ofbiz:url>/xmldsdump</ofbiz:url>" name="entityExport">
- <div class="tabletext">Output Directory : <input type="text" class="inputBox" size="60" name="outpath" value="<%=UtilFormatOut.checkNull(outpath)%>"/></div>
- <div class="tabletext">Max Records Per File : <input type="text" class="inputBox" size="10" name="maxrecords"/></div>
- <div class="tabletext">Single Filename : <input type="text" class="inputBox" size="60" name="filename" value="<%=UtilFormatOut.checkNull(filename)%>"/></div>
+ <div>Output Directory : <input type="text" class="inputBox" size="60" name="outpath" value="<%=UtilFormatOut.checkNull(outpath)%>"/></div>
+ <div>Max Records Per File : <input type="text" class="inputBox" size="10" name="maxrecords"/></div>
+ <div>Single Filename : <input type="text" class="inputBox" size="60" name="filename" value="<%=UtilFormatOut.checkNull(filename)%>"/></div>
- <div class="tabletext">Records Updated Since :
+ <div>Records Updated Since :
<input type="text" class="inputBox" size="25" name="entityFrom" />
<a href="javascript:call_cal(document.entityExport.entityFrom, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a>
</div>
- <div class="tabletext">Records Updated Before :
+ <div>Records Updated Before :
<input type="text" class="inputBox" size="25" name="entityThru" />
<a href="javascript:call_cal(document.entityExport.entityThru, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a>
</div>
- <div class="tabletext">OR Out to Browser: <input type="checkbox" name="tobrowser" <%=tobrowser?"checked":""%>></div>
+ <div>OR Out to Browser: <input type="checkbox" name="tobrowser" <%=tobrowser?"checked":""%>></div>
<br/>
- <div class="tabletext">Entity Names:</div>
+ <div>Entity Names:</div>
<input type="submit" value="Export"/>
<a href="<ofbiz:url>/xmldsdump?checkAll=true</ofbiz:url>" class="buttontext">Check All</a>
<a href="<ofbiz:url>/xmldsdump</ofbiz:url>" class="buttontext">Un-Check All</a>
- <div class="tabletext">Entity Sync Dump:
+ <div>Entity Sync Dump:
<input name="entitySyncId" class="inputBox" size="30" value="<%=UtilFormatOut.checkNull(entitySyncId)%>"/>
</div>
Pre-configured set:
@@ -403,7 +403,7 @@ under the License.
<%ModelEntity curModelEntity = delegator.getModelEntity(curEntityName);%>
<%if (curModelEntity instanceof ModelViewEntity) check = false;%>
<%}%>
- <td><div class="tabletext"><input type="checkbox" name="entityName" value="<%=curEntityName%>" <%=check?"checked":""%>/><%=curEntityName%></div></td>
+ <td><div><input type="checkbox" name="entityName" value="<%=curEntityName%>" <%=check?"checked":""%>/><%=curEntityName%></div></td>
<%}%>
</tr>
</table>
@@ -413,6 +413,6 @@ under the License.
<A href="<ofbiz:url>/xmldsdump</ofbiz:url>" class="buttontext">Un-Check All</A>
</form>
<%} else {%>
- <div class="tabletext">You do not have permission to use this page (ENTITY_MAINT needed)</div>
+ <div>You do not have permission to use this page (ENTITY_MAINT needed)</div>
<%}%>
<%}%>
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/widget/PortalAdmForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/widget/PortalAdmForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/widget/PortalAdmForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/widget/PortalAdmForms.xml Tue Jul 3 19:42:32 2012
@@ -179,7 +179,7 @@ under the License.
</hyperlink>
</field>
<field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
- <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true">
+ <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" sort-field="true">
<display>
<in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
<simple-editor/>
@@ -187,8 +187,8 @@ under the License.
</in-place-editor>
</display>
</field>
- <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" widget-style="tabletext" sort-field="true"><display/></field>
- <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" widget-style="tabletext" sort-field="true">
+ <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" sort-field="true"><display/></field>
+ <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" sort-field="true">
<display>
<in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
<simple-editor/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -32,7 +32,8 @@
<!-- entity resources: model(s), eca(s), group, and data definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/AssetMaintSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl Tue Jul 3 19:42:32 2012
@@ -25,7 +25,7 @@ under the License.
</div>
<br />
<div id="footer" align="center">
- <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org/" class="tabletext" target="_blank">www.apache.org</a></div>
+ <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org/" target="_blank">www.apache.org</a></div>
</div>
<br />
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -26,7 +26,8 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EbaySecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml Tue Jul 3 19:42:32 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EbayStoreSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStorePortletData.xml"/>