From 46a17a9c46c7972ebf20d3cc25b8a4165e0a6958 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 19:30:24 +0000
Subject: [PATCH] NIHVIVO-1462 Handle requests for non-existent individuals

---
 .../webapp/controller/freemarker/IndividualController.java | 2 +-
 .../web/templates/freemarker/body/error/error-titled.ftl   | 7 +++++++
 .../freemarker/body/error/error-titledMessage.ftl          | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 webapp/web/templates/freemarker/body/error/error-titled.ftl
 delete mode 100644 webapp/web/templates/freemarker/body/error/error-titledMessage.ftl

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
index 1fb9e19ac..5944e02ab 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
@@ -660,7 +660,7 @@ public class IndividualController extends FreemarkerHttpServlet {
         body.put("title","Individual Not Found");
         body.put("errorMessage", "The individual was not found in the system.");
         
-        return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_NOT_FOUND);
+        return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body);
     }
 
 }
diff --git a/webapp/web/templates/freemarker/body/error/error-titled.ftl b/webapp/web/templates/freemarker/body/error/error-titled.ftl
new file mode 100644
index 000000000..9e09d9b87
--- /dev/null
+++ b/webapp/web/templates/freemarker/body/error/error-titled.ftl
@@ -0,0 +1,7 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. -->
+
+<h2>${title}</h2>
+
+<#include "error-message.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl b/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl
deleted file mode 100644
index 2bcf2cf68..000000000
--- a/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Standard template to display an error message generated from any controller. Keeps this out of individual templates. -->
-
-<h2>${title}</h2>
-
-<#include "errorMessage.ftl">
\ No newline at end of file