svn commit: r1703973 - in /ofbiz/branches/release14.12/applications/party: webapp/partymgr/WEB-INF/controller.xml webapp/partymgr/party/profileblocks/Contact.ftl widget/partymgr/PartyScreens.xml

[diveshdutta]

Author: diveshdutta
Date: Sat Sep 19 10:12:45 2015
New Revision: 1703973

URL: http://svn.apache.org/viewvc?rev=1703973&view=rev
Log:
[OFBIZ-6438] Applied fix from trunk. Fixed issue: PartyGeoLocation shows menus when accessed. Thanks Pravin for your patch and thanks Pierre for reporting the issue.

Modified:
    ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/branches/release14.12/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
    ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyScreens.xml

Modified: ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1703973&r1=1703972&r2=1703973&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Sep 19 10:12:45 2015
@@ -1161,6 +1161,11 @@ under the License.
         <response name="success" type="view" value="PartyGeoLocation"/>
         <response name="error" type="view" value="viewprofile"/>
     </request-map>
+    <request-map uri="GetPartyGeoLocation">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="GetPartyGeoLocation"/>
+        <response name="error" type="view" value="viewprofile"/>
+    </request-map>
     <request-map uri="addGeoLocation">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="addGeoLocation"/>
@@ -1379,6 +1384,7 @@ under the License.
     <view-map name="PartyFinancialHistory" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyFinancialHistory"/>
     <view-map name="Preferences" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#Preferences"/>
     <view-map name="PartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyGeoLocation"/>
+    <view-map name="GetPartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#GetPartyGeoLocation"/>
 
     <view-map name="UpdateCommOrders" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommOrders"/>
     <view-map name="UpdateCommProducts" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommProducts"/>

Modified: ofbiz/branches/release14.12/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=1703973&r1=1703972&r2=1703973&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/branches/release14.12/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Sat Sep 19 10:12:45 2015
@@ -65,7 +65,7 @@ under the License.
                       <#if contactMechPurposeType?has_content>
                         <#assign popUptitle = contactMechPurposeType.get("description", locale) + uiLabelMap.CommonGeoLocation>
                       </#if>
-                      <a href="javascript:popUp('<@ofbizUrl>PartyGeoLocation?geoPointId=${postalAddress.geoPointId}&partyId=${partyId}</@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+                      <a href="javascript:popUp('<@ofbizUrl>GetPartyGeoLocation?geoPointId=${postalAddress.geoPointId}&partyId=${partyId}</@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
                     </#if>
                   </#if>
                 <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>

Modified: ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyScreens.xml?rev=1703973&r1=1703972&r2=1703973&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyScreens.xml Sat Sep 19 10:12:45 2015
@@ -1182,6 +1182,22 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="GetPartyGeoLocation">
+        <section>
+            <actions>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
+                <set field="tabButtonItem" value="PartyGeoLocation"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy"/>
+            </actions>
+            <widgets>
+                <label>${uiLabelMap.CommonLatitude} ${latestGeoPoint.latitude}</label>
+                <label>${uiLabelMap.CommonLongitude} ${latestGeoPoint.longitude}</label>
+                <label>${uiLabelMap.CommonElevation} ${latestGeoPoint.elevation} ${elevationUomAbbr}</label>
+                <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
     <screen name="EditGeoLocation">
         <section>
             <actions>