From 54ea6f06b4ec0ab00b891400f60e4587e10529cb Mon Sep 17 00:00:00 2001 From: rkv Date: Thu, 31 Jan 2013 12:34:34 +0000 Subject: [PATCH] Fix for mantis #0022066: Search form not conform to specifications (SC03): The "I'm involved in, Public, Either" radio button should be removed - additional fix for knowledges. --- .../WebContent/WEB-INF/tiles/tiles-defs.xml | 1 + .../WebContent/study/searchKnowledge.jsp | 43 +++---------------- .../Siman/WebContent/study/searchStudy.jsp | 19 +++----- .../splat/simer/SearchKnowledgeAction.java | 34 --------------- Workspace/Siman/src/som.properties | 1 + Workspace/Siman/src/som_en.properties | 1 + .../Siman/src/spring/applicationContext.xml | 2 +- 7 files changed, 16 insertions(+), 85 deletions(-) diff --git a/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml b/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml index 878eceb..897ce9b 100644 --- a/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml +++ b/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml @@ -88,6 +88,7 @@ +

diff --git a/Workspace/Siman/WebContent/study/searchKnowledge.jsp b/Workspace/Siman/WebContent/study/searchKnowledge.jsp index 5be4186..a2fc887 100644 --- a/Workspace/Siman/WebContent/study/searchKnowledge.jsp +++ b/Workspace/Siman/WebContent/study/searchKnowledge.jsp @@ -1,16 +1,12 @@ <%@page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> -<%@page import="org.splat.dal.bo.som.KnowledgeElement"%> <%@page import="org.splat.som.ApplicationRights"%> -<%@page import="org.splat.simer.ApplicationSettings"%> <%@page import="java.util.ResourceBundle"%> -<%@page import="java.util.Calendar"%> <%@page import="java.text.SimpleDateFormat"%> <%@page import="org.splat.simer.Action"%> <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@taglib prefix="s" uri="/struts-tags"%> -