taylor 2002/07/03 10:10:20
Modified: src/java/org/apache/jetspeed/modules/actions/controllers
RowColumnControllerAction.java
src/sql/external populate-oracle.sql
webapp/WEB-INF/conf JetspeedSecurity.properties
Log:
Fixed bug in Psml Browser so that cancel goes back to the Browser, not the view mode
of the page being customized.
Revision Changes Path
1.13 +11 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java
Index: RowColumnControllerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RowColumnControllerAction.java 14 Apr 2002 16:49:09 -0000 1.12
+++ RowColumnControllerAction.java 3 Jul 2002 17:10:19 -0000 1.13
@@ -306,8 +306,17 @@
{
Log.error(e);
}
- data.setRedirectURI(jsLink.toString());
+ String caller = (String)context.get("_tempCaller");
+ if (caller != null && caller.equals("apply"))
+ {
+ data.setRedirectURI(jsLink.toString());
+ }
+ else
+ {
+ data.setRedirectURI(jsLink.getHomePage().toString());
+ }
JetspeedLinkFactory.putInstance(jsLink);
+
jsLink = null;
}
}
@@ -329,6 +338,7 @@
public void doApply(RunData data, Context context)
{
doSave(data,context);
+ context.put("_tempCaller", "apply");
doCancel(data,context);
}
1.6 +1 -1 jakarta-jetspeed/src/sql/external/populate-oracle.sql
Index: populate-oracle.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/populate-oracle.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- populate-oracle.sql 28 Jun 2002 05:37:36 -0000 1.5
+++ populate-oracle.sql 3 Jul 2002 17:10:20 -0000 1.6
@@ -13,7 +13,7 @@
INSERT INTO TURBINE_GROUP VALUES(2,'apache',NULL);
INSERT INTO TURBINE_USER
VALUES(0,'turbine','turbine','David','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007478');
INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Raphael','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a778');
-INSERT INTO TURBINE_USER
VALUES(2,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2001-11-11
18:45:41.671','F',NULL);
+INSERT INTO TURBINE_USER
VALUES(2,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,SYSDATE,'F',NULL);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,1);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,2);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,3);
1.4 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
