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

NIHVIVO-1392 Fix verbose property form for individuals in non-default namespace

Browse source
This commit is contained in:
rjy7 2011-03-14 20:21:50 +00:00
parent 813712c78c
commit b559e36228
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -41,7 +42,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RdfResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
@ -163,23 +163,29 @@ public class IndividualController extends FreemarkerHttpServlet {
if (loginBean.isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
// Get current verbose property display value
String verbose = vreq.getParameter("verbose");
Boolean verbosePropertyDisplayValue;
Boolean verboseValue;
// If the form was submitted, get that value
if (verbose != null) {
verbosePropertyDisplayValue = "true".equals(verbose);
verboseValue = "true".equals(verbose);
// If form not submitted, get the session value
} else {
Boolean verbosePropertyDisplayValueInSession = (Boolean) vreq.getSession().getAttribute("verbosePropertyDisplay");
// True if session value is true, otherwise (session value is false or null) false
verbosePropertyDisplayValue = Boolean.TRUE.equals(verbosePropertyDisplayValueInSession);
verboseValue = Boolean.TRUE.equals(verbosePropertyDisplayValueInSession);
}
vreq.getSession().setAttribute("verbosePropertyDisplay", verbosePropertyDisplayValue);
vreq.getSession().setAttribute("verbosePropertyDisplay", verboseValue);
map = new HashMap<String, Object>();
map.put("verboseFieldValue", String.valueOf(!verbosePropertyDisplayValue)); // the form toggles the current value
map.put("action", vreq.getRequestURI());
map.put("currentValue", verbosePropertyDisplayValue ? "on" : "off");
map.put("newValue", verbosePropertyDisplayValue ? "off" : "on");
String formAction = vreq.getRequestURI();
String queryString = vreq.getQueryString();
if (! StringUtils.isBlank(queryString)) {
formAction += "?" + queryString;
}
map.put("action", formAction);
// Use post since we are appending query string to form action.
map.put("method", "post");
map.put("currentValue", verboseValue);
map.put("newValue", String.valueOf(!verboseValue));
} else {
vreq.getSession().setAttribute("verbosePropertyDisplay", false);
}

15
webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
View file

@ -8,16 +8,15 @@
<#if verbosePropertyForm??>
<#assign formId = "verbosePropertyForm">
<form id="${formId}" action="${verbosePropertyForm.action}#${formId}" method="get">
<input type="hidden" name="verbose" value="${verbosePropertyForm.verboseFieldValue}" />
<span>Verbose property display is <b>${verbosePropertyForm.currentValue}</b> | </span>
<input type="submit" id="submit" class="small" value="Turn ${verbosePropertyForm.newValue}" />
<#assign currentValue = verbosePropertyForm.currentValue?string("on", "off")>
<#assign newValue = verbosePropertyForm.currentValue?string("off", "on")>
<form id="${formId}" action="${verbosePropertyForm.action}#${formId}" method="${verbosePropertyForm.method}">
<input type="hidden" name="verbose" value="${verbosePropertyForm.newValue}" />
<span>Verbose property display is <b>${currentValue}</b> | </span>
<input type="submit" id="submit" class="small" value="Turn ${newValue}" />
</form>
</#if>
</form>
<p class="uri-link">Resource URI: <a href="${individual.uri}" target="_blank">${individual.uri}</a></p>
</section>
</#if>