svn commit: r539247 - in /ofbiz/trunk/applications/party/webapp/partymgr: WEB-INF/web.xml party/PartyForms.xml party/findparty.ftl

[jaz-3]

Author: jaz
Date: Thu May 17 20:46:18 2007
New Revision: 539247

URL: http://svn.apache.org/viewvc?view=rev&rev=539247
Log:
updated find party so create new links can determine what type of party to create (person vs group) based on the search parameters

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml?view=diff&rev=539247&r1=539246&r2=539247
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml Thu May 17 20:46:18 2007
@@ -117,15 +117,7 @@
     <error-code>500</error-code>
     <location>/error/error.jsp</location>
   </error-page>
--->
-  <taglib>
-     <taglib-uri>ofbizTags</taglib-uri>
-     <taglib-location>/WEB-INF/ofbiz.tld</taglib-location>
-  </taglib>
-  <taglib>
-     <taglib-uri>regions</taglib-uri>
-     <taglib-location>/WEB-INF/regions.tld</taglib-location>
-  </taglib>
+-->  
 
 <!-- HTTP Response Code definitions:
 | "400"   ; Bad Request

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?view=diff&rev=539247&r1=539246&r2=539247
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu May 17 20:46:18 2007
@@ -468,6 +468,7 @@
             </drop-down>
         </field>
         <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="finAccountTypeId"><ignored/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 

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?view=diff&rev=539247&r1=539246&r2=539247
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Thu May 17 20:46:18 2007
@@ -152,7 +152,7 @@
           <#if extInfo == "O">
             <tr><td colspan="3"><hr/></td></tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyContactInfoList} :</td>
+              <td class="label">${uiLabelMap.PartyContactInformation} :</td>
               <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
             </tr>
           </#if>
@@ -303,13 +303,23 @@
       </table>
     <#else>
       <div class="screenlet-body">
-        <span class="head3">${uiLabelMap.PartyNoPartiesFound}</span>
-        <a href="<@ofbizUrl>createnew</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew}</a>
+        <span class="head3">${uiLabelMap.PartyNoPartiesFound}</span>        
       </div>
     </#if>
     <#if lookupErrorMessage?exists>
       <div><h3>${lookupErrorMessage}</h3></div>
     </#if>
+    <#if (parameters.firstName?has_content || parameters.lastName?has_content)>
+        <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/>
+    <#elseif (parameters.groupName?has_content)>
+        <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/>
+    <#else>
+        <#assign createUrl = "createnew"/>
+    </#if>
+    
+    <div>&nbsp;</div>
+    <div align='right' valign="top"><a href="<@ofbizUrl>${createUrl}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew}</a></div>
+    <br/>
   </div>
 </#if>
 <!-- end findParty.ftl -->