svn commit: r965018 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.xml webapp/partymgr/WEB-INF/actions/party/LinkParty.groovy webapp/partymgr/party/linkparty.ftl widget/partymgr/PartyForms.xml widget/partymgr/PartyScreens.xml

[hansbak-2]

Author: hansbak
Date: Sat Jul 17 05:46:04 2010
New Revision: 965018

URL: http://svn.apache.org/viewvc?rev=965018&view=rev
Log:
replace ftl with form because no submit button present on the link form, also added an explanation of this function

Removed:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/LinkParty.groovy
    ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=965018&r1=965017&r2=965018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sat Jul 17 05:46:04 2010
@@ -6260,6 +6260,9 @@
         <value xml:lang="th">เชื่อมโยงกลุ่มผู้ใช้</value>
         <value xml:lang="zh">链接会员</value>
     </property>
+    <property key="PartyLinkExplanation">
+        <value xml:lang="en">This will set the status of 'partyId' to disabled however will link it to 'partyTo' in the party Attributes</value>
+    </property>
     <property key="PartyLinkMessage1">
         <value xml:lang="de">WARNUNG: Dies kann nicht rückgängig gemacht werden. Bestätigen Sie bitte, dass Sie die beiden unten aufgeführten Akteure verknüpfen möchten. </value>
         <value xml:lang="en">WARNING: This cannot be un-done, confirm you wish to link the two party records listed below.</value>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=965018&r1=965017&r2=965018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Jul 17 05:46:04 2010
@@ -218,6 +218,13 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 
+    <form name="PartyLink" type="single" target="setPartyLink"
+        focus-field-name="partyId" header-row-style="header-row" default-table-style="basic-table">
+        <field position="1" name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field position="2" name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+      <field name="submitButton" title="${uiLabelMap.PartyLink}"><submit button-type="button" request-confirmation="true" confirmation-message="${uiLabelMap.PartyLinkMessage1}"/></field>
+    </form>
+
     <!-- PartyRelationship -->
     <form name="AddPartyRelationshipType" type="single" target="createPartyRelationshipType"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=965018&r1=965017&r2=965018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Jul 17 05:46:04 2010
@@ -206,15 +206,24 @@ under the License.
                 <set field="titleProperty" value="PartyLink"/>
                 <set field="headerItem" value="link"/>
                 <set field="tabButtonItem" value="linkparty"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/LinkParty.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://party/webapp/partymgr/party/linkparty.ftl"/></html>
-                        </platform-specific>
+                        <section>
+                            <condition>
+                                <if-has-permission permission="PARTYMGR" action="_UPDATE"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PartyLink}">
+                                    <label text="${uiLabelMap.PartyLinkExplanation}"></label>
+                                    <include-form name="PartyLink" location="component://party/widget/partymgr/PartyForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3" text="${uiLabelMap.PartyPermissionError}"/>
+                            </fail-widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>