Author: knguyen
Date: Mon Aug 6 17:08:57 2007
New Revision: 18145
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18145&repname=
=3Djahia
Log:
display time based publishing status icon for "valid but will expire" too.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etTimeBasedPublishingState.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm=
enus/GetTimeBasedPublishingState.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingStat=
e.java&rev=3D18145&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/ajax/actionmenus/G=
etTimeBasedPublishingState.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etTimeBasedPublishingState.java Mon Aug 6 17:08:57 2007
@@ -156,7 +156,7 @@
}
// Don't display any icons for objects that have no rules
if (! jParams.settings().showTimeBasedPublishingIcons() ||
- "".equals(statusLabel) || statusLabel.indexOf("inherited_v=
alid") > -1) {
+ "".equals(statusLabel) || "inherited_valid".equals(statusL=
abel) ) {
//statusLabel =3D "unknown";
statusLabel =3D "org.jahia.pix.image";
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Page_Field.java&rev=3D18145&=
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/engines/shared/Pag=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java Mon Aug 6 17:08:57 2007
@@ -416,7 +416,7 @@
}
}
// Don't display any icons for objects that have no ru=
les
- if (!"".equals(statusLabel) && !(statusLabel.indexOf("=
inherited_valid") > -1)
+ if (!"".equals(statusLabel) && !("inherited_valid".equ=
als(statusLabel))
&& !(statusLabel.equals("valid"))) {
jParams.setAttribute("Page_Field.enableTimeBasedPu=
blishingStatus",currentObject);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
