svn commit: r581162 - in /ofbiz/trunk/applications: party/script/org/ofbiz/party/user/ party/webapp/partymgr/party/ party/widget/partymgr/ product/webapp/catalog/store/

[hansbak-2]

Author: hansbak
Date: Tue Oct  2 02:01:40 2007
New Revision: 581162

URL: http://svn.apache.org/viewvc?rev=581162&view=rev
Log:
revert 581146, according to david, this change was not required: it seems that crashing a browser is a better message to the user

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Oct  2 02:01:40 2007
@@ -30,7 +30,7 @@
         <call-simple-method method-name="createUser"/>
     </simple-method>
     <simple-method method-name="createProspect" short-description="Create Prospect" login-required="false">
-        <set field="require_email" value="true" />
+        <set field="parameters.require_email" default-value="true" />
         <set field="require_phone" value="false" />
         <set field="require_login" value="false" />
         <set field="create_allow_password" value="true" />

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl Tue Oct  2 02:01:40 2007
@@ -116,7 +116,7 @@
           ${uiLabelMap.PartyPartyInTheRoleOf}
           <select name="roleTypeIdTo">
             <#list roleTypes as roleType>
-              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}<#-- [${roleType.roleTypeId}]--></option>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
             </#list>
           </select>
           ${uiLabelMap.CommonIsA}
@@ -128,7 +128,7 @@
           ${uiLabelMap.PartyPartyOfTheRoleParty}
           <select name="roleTypeIdFrom">
             <#list roleTypesForCurrentParty as roleType>
-              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}<#-- [${roleType.roleTypeId}]--></option>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
             </#list>
           </select>
           <#-- set security group specific to this party relationship -->
@@ -153,7 +153,7 @@
           ${uiLabelMap.PartyPartyCurrentInTheRoleOf}
           <select name="roleTypeIdTo">
             <#list roleTypesForCurrentParty as roleType>
-              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}<#-- [${roleType.roleTypeId}]--></option>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
             </#list>
           </select>
           ${uiLabelMap.CommonIsA}
@@ -168,7 +168,7 @@
           ${uiLabelMap.PartyPartyInTheRoleOf}
           <select name="roleTypeIdFrom">
             <#list roleTypes as roleType>
-              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}<#-- [${roleType.roleTypeId}]--></option>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
             </#list>
           </select>
           <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue Oct  2 02:01:40 2007
@@ -267,6 +267,8 @@
 
     <form name="NewUser" type="single" target="${target}${previousParams}"
         style="basic-form form-widget" focus-field-name="USER_TITLE">
+        <field name="USE_ADDRESS"><hidden value="${USE_ADDRESS}"/></field>
+        <field name="require_email"><hidden value="${require_email}"/></field>
         <field name="USER_TITLE" title="${uiLabelMap.CommonTitle}"><text size="10" maxlength="30"/></field>
         <field name="USER_FIRST_NAME" title="${uiLabelMap.PartyFirstName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
         <field name="USER_MIDDLE_NAME" title="${uiLabelMap.PartyMiddleInitial}"><text size="4" maxlength="4"/></field>
@@ -320,7 +322,8 @@
         <field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
         <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
         <field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
-        <field name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="60" maxlength="250"/></field>
+        <field use-when="require_email!=null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="60" maxlength="250"/></field>
+        <field use-when="require_email==null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" widget-style="required"><text size="60" maxlength="250"/></field>
         <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
         <!-- <field name="USER_ORDER_EMAIL" title="Order Emails (comma separated)" ><text size="60" maxlength="250"/></field> -->
         <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="250"/></field>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue Oct  2 02:01:40 2007
@@ -85,7 +85,7 @@
                 </#if>
                 <option value="ANY">${uiLabelMap.CommonAnyRoleType}</option>
                 <#list roleTypes as roleType>
-                  <option value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}</option>
+                  <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
                 </#list>
               </select>
             </td>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl Tue Oct  2 02:01:40 2007
@@ -29,7 +29,7 @@
         <#list partyRoles as userRole>
           <tr>
             <td class="label">${uiLabelMap.PartyRole}</td>
-            <td>${userRole.get("description",locale)?if_exists} [${userRole.roleTypeId}]</td>
+            <td>${userRole.get("description",locale)} [${userRole.roleTypeId}]</td>
             <#if hasDeletePermission>
               <td class="button-col align-float">
                 <a href="<@ofbizUrl>deleterole?partyId=${partyId}&roleTypeId=${userRole.roleTypeId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>&nbsp;

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Oct  2 02:01:40 2007
@@ -590,6 +590,8 @@
                 <set field="displayPassword" value="Y"/>
                 <set field="target" value="createProspect"/>
                 <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="USE_ADDRESS" value="false"/>
+                <set field="require_email" value="false"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl?rev=581162&r1=581161&r2=581162&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl Tue Oct  2 02:01:40 2007
@@ -36,7 +36,7 @@
         <#assign roleType = role.getRelatedOne("RoleType")>
         <tr>
           <td><a href="/partymgr/control/viewprofile?partyId=${role.partyId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${role.partyId}</a></td>
-          <td><span class="tabletext">${roleType.get("description",locale)?if_exists}</span></td>
+          <td><span class="tabletext">${roleType.get("description",locale)}</span></td>
           <td><span class="tabletext">${role.fromDate?string}</span></td>
           <td><span class="tabletext">${role.thruDate?default("${uiLabelMap.CommonNA}")?string?if_exists}</span></td>
           <#if role.thruDate?exists>
@@ -61,7 +61,7 @@
         <td>
           <select class="selectBox" name="roleTypeId">
             <#list roleTypes as roleType>
-              <option value="${roleType.roleTypeId}">${roleType.get("description",locale)?if_exists}</option>
+              <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
             </#list>
           </select>
         </td>