From dfc3163ac13fa3a59b4fcfd06595f475b98067bb Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 15 Oct 2013 10:27:31 -0400 Subject: [PATCH 1/3] js file needed to reference jQuery instead of just $ --- webapp/web/js/vitroUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/web/js/vitroUtils.js b/webapp/web/js/vitroUtils.js index ee9f88e08..e910efa74 100644 --- a/webapp/web/js/vitroUtils.js +++ b/webapp/web/js/vitroUtils.js @@ -5,7 +5,7 @@ $(document).ready(function(){ // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing // pages, overwrites $. // fade out welcome-message when user logs in - $.extend(this, i18nStrings); + jQuery.extend(this, i18nStrings); jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); From 3b6d65176d82ddf485ee35514ff826cbe49f2b1d Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 15 Oct 2013 12:59:57 -0400 Subject: [PATCH 2/3] VIVO-363 Write the exception to the log, first thing. --- webapp/web/error.jsp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/webapp/web/error.jsp b/webapp/web/error.jsp index 07a8a2e37..566e53673 100755 --- a/webapp/web/error.jsp +++ b/webapp/web/error.jsp @@ -5,7 +5,19 @@ <%@ page import="com.oreilly.servlet.ServletUtils,edu.cornell.mannlib.vitro.webapp.web.*" %> <%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%> +<%@page import="org.apache.commons.logging.Log"%> +<%@page import="org.apache.commons.logging.LogFactory"%> <% + // We have seen that this page can throw its own error. + // Before it does so, be sure that we have written the original error to the log. + Object c = request.getAttribute("javax.servlet.jsp.jspException"); + if (c instanceof Throwable) { + Throwable cause = (Throwable) c; + Log log = LogFactory.getLog(this.getClass()); + log.error("Error: ", cause); + } + + VitroRequest vreq = new VitroRequest(request); ApplicationBean appBean = vreq.getAppBean(); String themeDir = appBean.getThemeDir(); From 7fc2f07a7701c7253897a6b5fecac44d9bbdd8b9 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 15 Oct 2013 15:43:23 -0400 Subject: [PATCH 3/3] Get language-correct labels whether editing or not. --- .../web/templatemodels/individual/GroupedPropertyList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java index 00fd7e13b..cedb9bde0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java @@ -108,9 +108,9 @@ public class GroupedPropertyList extends BaseTemplateModel { if (editing) { mergeAllPossibleDataProperties(propertyList); - propertyList = correctLanguageForProperties(propertyList); } + propertyList = correctLanguageForProperties(propertyList); sort(propertyList); // Put the list into groups