svn commit: r1148222 - in /ofbiz/trunk/applications/party: webapp/partymgr/party/editGeoLocation.ftl widget/partymgr/PartyScreens.xml

[hansbak-2]

Author: hansbak
Date: Tue Jul 19 08:18:07 2011
New Revision: 1148222

URL: http://svn.apache.org/viewvc?rev=1148222&view=rev
Log:
sorry about the 2 previous fixes it took us some time how the google key works....should be ok now....

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl?rev=1148222&r1=1148221&r2=1148222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl Tue Jul 19 08:18:07 2011
@@ -17,7 +17,9 @@ specific language governing permissions
 under the License.
 -->
 
-<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${googleMapKey?if_exists}" type="text/javascript"></script>
+<#assign defaultUrl = "https." + request.getServerName()>
+<#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
+<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${defaultGogleMapKey}" type="text/javascript"></script>
 <script type="text/javascript">
     function load() {
         if (GBrowserIsCompatible()) {

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1148222&r1=1148221&r2=1148222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Jul 19 08:18:07 2011
@@ -1158,7 +1158,6 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
                 <set field="tabButtonItem" value="PartyGeoLocation"/>
-                <property-to-field field="googleMapKey" resource="general" property="https.demo-trunk.ofbiz.apache.org"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy"/>
             </actions>