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

VIVO-998: the label will no longer be rendered on the page, leaving the name field.

Browse source
This commit is contained in:
Tim Worrall 2015-03-19 12:49:55 -04:00
parent 4e09f96548
commit ed0b7f0f0d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
View file

@ -8,6 +8,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
@ -60,7 +61,7 @@ public class EntityRetryController extends BaseEditController {
SimplePermission.DO_BACK_END_EDITING.ACTION)) { SimplePermission.DO_BACK_END_EDITING.ACTION)) {
return; return;
} }
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
String siteAdminUrl = vreq.getContextPath() + Controllers.SITE_ADMIN; String siteAdminUrl = vreq.getContextPath() + Controllers.SITE_ADMIN;
@ -216,13 +217,18 @@ public class EntityRetryController extends BaseEditController {
if (!dpMap.containsKey(d.getURI())) { if (!dpMap.containsKey(d.getURI())) {
dpMap.put(d.getURI(),d); dpMap.put(d.getURI(),d);
} }
} }
if (individualForEditing.getDataPropertyList() != null) { if (individualForEditing.getDataPropertyList() != null) {
Iterator<DataProperty> existingDps = individualForEditing.getDataPropertyList().iterator(); Iterator<DataProperty> existingDps = individualForEditing.getDataPropertyList().iterator();
while (existingDps.hasNext()) { while (existingDps.hasNext()) {
DataProperty existingDp = existingDps.next(); DataProperty existingDp = existingDps.next();
dpMap.put(existingDp.getURI(),existingDp); // Since the edit form begins with a "name" field, which gets saved as the rdfs:label,
// do not want to include the label as well.
if ( !existingDp.getPublicName().equals("label") ) {
dpMap.put(existingDp.getURI(),existingDp);
}
} }
} }
@ -296,7 +302,6 @@ public class EntityRetryController extends BaseEditController {
request.setAttribute("_action",action); request.setAttribute("_action",action);
request.setAttribute("unqualifiedClassName","Individual"); request.setAttribute("unqualifiedClassName","Individual");
setRequestAttributes(request,epo); setRequestAttributes(request,epo);
try { try {
rd.forward(request, response); rd.forward(request, response);
} catch (Exception e) { } catch (Exception e) {