litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

property labeling consistency in hierarchy and list displays

Browse source
This commit is contained in:
brianjlowe 2013-10-17 10:43:53 -04:00
parent 7e20ef9e6e
commit 65c913578b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
View file

@ -107,7 +107,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
json += ", ";
}
String nameStr = prop.getPickListName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName();
String nameStr = prop.getPickListName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPickListName();
try {
json += "{ \"name\": " + JSONUtils.quote("<a href='datapropEdit?uri="+ URLEncoder.encode(prop.getURI())+"'>" + nameStr + "</a>") + ", ";

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
View file

@ -208,7 +208,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
String nameStr = dp.getPickListName() == null
? dp.getName() == null
? dp.getURI() == null
? "(no name)" : dp.getURI() : dp.getName() : dp.getPublicName();
? "(no name)" : dp.getURI() : dp.getName() : dp.getPickListName();
tempString += JSONUtils.quote(
"<a href='datapropEdit?uri=" + URLEncoder.encode(