taylor 01/12/10 09:28:00
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
Log:
- Its no longer possible to add sub-panes which are not customizable.
- When moving from addpane to properties page to the wml customization, the mode is
reset to layout because those modes are not supported in wml
Revision Changes Path
1.11 +21 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CustomizeSetAction.java 2001/12/06 06:26:54 1.10
+++ CustomizeSetAction.java 2001/12/10 17:28:00 1.11
@@ -121,8 +121,8 @@
/**
* Reload profile for customization (if necessary)
* --------------------------------------------------------------------------
- * last modified: 10/31/01
- * Andreas Kempf, Siemens ICM S CP PE, Munich
+ * last modified: 12/10/01
+ * Andreas Kempf, Siemens ICM S CP OP, Munich
* mailto: [EMAIL PROTECTED]
*/
AutoProfile.doIt (rundata, true);
@@ -147,13 +147,20 @@
String mode = rundata.getParameters().getString("mode");
if (mode == null)
{
- mode = (String)rundata.getUser().getTemp("mode");
- if (mode == null) mode = "layout";
+ mode = (String)rundata.getUser().getTemp("mode");
+ if ((mode==null) || (mode.equalsIgnoreCase("addset")) ||
(mode.equalsIgnoreCase("general")))
+ mode = "layout";
+
}
else
{
- rundata.getUser().setTemp("mode",mode);
+ if ((mediaType.equalsIgnoreCase("wml")) &&
(!mode.equalsIgnoreCase("add")))
+ mode = "layout";
+
+ rundata.getUser().setTemp("mode",mode);
}
+
+ System.out.println (mode);
String template = (String)context.get("template");
@@ -191,8 +198,8 @@
* Special handling for wml profiles
* no skins, no properties menuentry, no panes
* --------------------------------------------------------------------------
- * last modified: 10/31/01
- * Andreas Kempf, Siemens ICM S CP PE, Munich
+ * last modified: 12/10/01
+ * Andreas Kempf, Siemens ICM S CP OP, Munich
* mailto: [EMAIL PROTECTED]
*/
@@ -204,13 +211,19 @@
else
{
context.put("currentSkin",
set.getPortletConfig().getPortletSkin().getName());
- context.put("allowproperties", "true");
+ if (((String) jdata.getSession().getAttribute
("customizedPaneName")).equalsIgnoreCase("*"))
+ context.put("allowproperties", "false");
+ else
+ context.put("allowproperties", "true");
}
+ context.put("allowpane","false");
+
// do not allow panes for wml profiles
if ((!mediaType.equalsIgnoreCase("wml")) && (set.getController() instanceof
PortletSetController))
{
+ if (((String) jdata.getSession().getAttribute
("customizedPaneName")).equalsIgnoreCase("*"))
context.put("allowpane","true");
}
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
