From ab927b494af63fef853ede234842ec8cc56db9fa Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 15:11:07 +0000
Subject: [PATCH] Changed name of IndividualProfileUrlMethod in template data
 model from "url" to "profileUrl"

---
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java     | 2 +-
 .../templatemodels/individual/ObjectPropertyTemplateModel.java  | 2 +-
 .../body/partials/individual/propStatement-default.ftl          | 2 +-
 .../body/partials/individual/propStatement-simple.ftl           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index 1ff0649da..7e031cf3b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -327,7 +327,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
     
     protected Map<String, Object> getMethods() {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("url", new edu.cornell.mannlib.vitro.webapp.web.functions.IndividualProfileUrlMethod());
+        map.put("profileUrl", new edu.cornell.mannlib.vitro.webapp.web.functions.IndividualProfileUrlMethod());
         return map;
     }
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index 7fb3b3145..0ab5f77b1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -197,7 +197,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
                 value = element.getChildNodes().item(0).getNodeValue();   
                 log.debug("Value of config parameter " + nodeName + " = " + value);
             } else {
-                log.warn("No value for config parameter " + nodeName);
+                log.debug("No value for config parameter " + nodeName);
             }
             return value;           
         }
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 6a6650797..0d42bb0e2 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -2,4 +2,4 @@
 
 <#-- Default object property statement template -->
 
-<a href="${url(statement.object)}">${statement.name!}</a> ${statement.moniker!} 
+<a href="${profileUrl(statement.object)}">${statement.name!}</a> ${statement.moniker!} 
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
index e1bffd918..1c870b613 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
@@ -2,4 +2,4 @@
 
 <#-- Simple object property statement template -->
 
-<a href="${url(statement.object)}">${statement.name!}</a>  
+<a href="${profileUrl(statement.object)}">${statement.name!}</a>