Author: sshyrkov
Date: Mon Jun 18 17:40:25 2007
New Revision: 17624
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17624&repname=
=3Djahia
Log:
JAHIA-1991: Admin: leaving an admin entry leads to the wrong tab.
http://www.jahia.net/jira/browse/JAHIA-1991
Resolved: Correct strecher tab is opened now
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/clipbuilder/MenuBu=
ilderAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati=
on/htmleditors/actions/HtmlEditorsAdminAction.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/clipbuilder/=
MenuBuilderAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/clipbuilder/MenuBuilderAction.java&rev=3D17=
624&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/clipbuilder/MenuBu=
ilderAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/clipbuilder/MenuBu=
ilderAction.java Mon Jun 18 17:40:25 2007
@@ -16,12 +16,16 @@
* limitations under the License.
*/package org.jahia.clipbuilder;
=
-import org.apache.struts.action.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jahia.clipbuilder.sql.SessionManager;
-import org.jahia.bin.*;
-import org.jahia.exceptions.*;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.jahia.bin.AdminAction;
+import org.jahia.bin.JahiaAdministration;
+import org.jahia.bin.JahiaErrorDisplay;
+import org.jahia.exceptions.JahiaException;
=
/**
* Builder Menu action
@@ -43,6 +47,9 @@
org.jahia.clipbuilder.sql.SessionManager.removeAll(request);
try {
init(request, response);
+ request.getSession().setAttribute(
+ JahiaAdministration.CLASS_NAME + "configJahia",
Boolean.FALS=
E);
+
//String URL =3D (String)request.getAttribute( "URL");
//request.setAttribute( "URL",URL+"/");
} catch (JahiaException ex) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/admini=
stration/htmleditors/actions/HtmlEditorsAdminAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/views/administration/htmleditors/actions/Ht=
mlEditorsAdminAction.java&rev=3D17624&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati=
on/htmleditors/actions/HtmlEditorsAdminAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati=
on/htmleditors/actions/HtmlEditorsAdminAction.java Mon Jun 18 17:40:25 2007
@@ -17,43 +17,34 @@
*/package org.jahia.views.administration.htmleditors.actions;
=
import java.io.IOException;
-import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Date;
import java.util.Enumeration;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.Vector;
=
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
=
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-
+import org.jahia.bin.AdminAction;
import org.jahia.bin.Jahia;
import org.jahia.bin.JahiaAdministration;
import org.jahia.bin.JahiaErrorDisplay;
import org.jahia.data.JahiaData;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaForbiddenAccessException;
-import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.htmleditors.*;
-import org.jahia.services.htmlparser.*;
-import org.jahia.services.sites.*;
import org.jahia.services.acl.JahiaBaseACL;
-import org.jahia.bin.AdminAction;
+import org.jahia.services.htmlparser.HtmlParserService;
+import org.jahia.services.htmlparser.MarkupDefinition;
+import org.jahia.services.htmlparser.MarkupSetting;
+import org.jahia.services.htmlparser.ToRemoveMarkupSetting;
+import org.jahia.services.sites.JahiaSite;
+import org.jahia.services.sites.JahiaSitesService;
=
=
/**
@@ -67,8 +58,6 @@
*/
public class HtmlEditorsAdminAction extends AdminAction {
=
- private static final String HTTP_FILES =3D "/jsp/jahia/engines";
-
private static org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(HtmlEditorsAdminAction.class=
);
=
@@ -148,9 +137,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request
- .getAttribute("org.jahia.data.JahiaData");
-
final Enumeration editors =3D ServicesRegistry.getInstance()
.getHtmlEditorsService().getEditors();
=
@@ -204,9 +190,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request
- .getAttribute("org.jahia.data.JahiaData");
-
deleteSelectedMarkups(request);
=
final ArrayList markupsToRemove =3D getMarkupToRemove();
@@ -294,9 +277,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request
- .getAttribute("org.jahia.data.JahiaData");
-
String value =3D (String)request.getAttribute("markupName");
if ( value =3D=3D null ){
value =3D "";
@@ -333,9 +313,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request
- .getAttribute("org.jahia.data.JahiaData");
-
final HtmlParserService htmlPServ =3D ServicesRegistry.getInst=
ance()
.getHtmlParserService();
=
@@ -394,9 +371,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request.
- getAttribute("org.jahia.data.JahiaData");
-
final JahiaSitesService sitesServ =3D ServicesRegistry.getInst=
ance()
.getJahiaSitesService();
=
@@ -433,9 +407,6 @@
try {
init(request,response);
=
- final JahiaData jData =3D (JahiaData)request
- .getAttribute("org.jahia.data.JahiaData");
-
JahiaSitesService sitesServ =3D ServicesRegistry.getInstance()
.getJahiaSitesService();
=
@@ -513,6 +484,9 @@
throws JahiaException {
=
super.init(request,response);
+ =
+ request.getSession().setAttribute(
+ JahiaAdministration.CLASS_NAME + "configJahia",
Boolean.TRUE);
=
final JahiaData jData =3D (JahiaData)request.getAttribute("org.jah=
ia.data.JahiaData");
if ( ServicesRegistry.getInstance().getJahiaACLManagerService().ge=
tServerActionPermission("admin.htmleditors.HtmlEditorsAdmin",
@@ -554,7 +528,7 @@
final char[] chars =3D name.toCharArray();
final int size =3D chars.length;
for ( int i=3D0; i<size; i++ ){
- if ( this.alphabet.indexOf(chars[i]) =3D=3D -1 ){
+ if ( HtmlEditorsAdminAction.alphabet.indexOf(chars[i]) =3D=3D =
-1 ){
return false;
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
