xlawrence 2005/07/04 14:56:41 CEST
Modified files:
core/src/java/org/jahia/engines/shared BigText_Field.java
Log:
Updated staging warning so it only generates a warning for staging pages that
have never been validated
Revision Changes Path
1.15 +11 -12
jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java.diff?r1=1.14&r2=1.15&f=h
Index: BigText_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BigText_Field.java 27 Jun 2005 15:55:30 -0000 1.14
+++ BigText_Field.java 4 Jul 2005 12:56:41 -0000 1.15
@@ -722,14 +722,14 @@
// For each page referenced in a hardcoded link
while (ite.hasNext()) {
- final Integer pid = (Integer)ite.next();
+ final int pid = ((Integer)ite.next()).intValue();
final ContentPage page;
try {
- page = ContentPage.getPage(pid.intValue());
+ page = ContentPage.getPage(pid);
} catch (JahiaPageNotFoundException e) {
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.notExistingWarning",
- pid);
+ Integer.toString(pid));
result.add("BigText.notExisting", msg);
continue;
}
@@ -737,16 +737,16 @@
if (page == null) {
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.notExistingWarning",
- pid);
+ Integer.toString(pid));
result.add("BigText.notExisting", msg);
continue;
}
final String noAccess =
getFieldGroupsNotHavingAccessOnPageAsString(
- pid.intValue(), theField, jParams, engineMap);
+ pid, theField, jParams, engineMap);
if (noAccess != null && noAccess.length() > 0) {
- final String[] values = {pid.toString(), noAccess};
+ final String[] values = {Integer.toString(pid),
noAccess};
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.lessAccessWarning",
values);
@@ -765,24 +765,23 @@
lang = currentLang;
}
- state = getPageState(pid.intValue(), lang);
+ state = getPageState(pid, lang);
if ("active".equals(state)) { continue; }
- if ("staging".equals(state)) {
- final String[] values = {pid.toString(), lang};
+ if ("staging".equals(state) && page.getActiveVersionID()
<= 0) {
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.stagingWarning",
- values);
+ Integer.toString(pid));
result.add("BigText.staging", msg);
} else if ("markForDeleted".equals(state)) {
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.markForDeleteWarning",
- pid);
+ Integer.toString(pid));
result.add("BigText.markForDeleted", msg);
} else if ("waiting".equals(state)) {
- final String[] values = {pid.toString(), lang};
+ final String[] values = {Integer.toString(pid),
lang};
final EngineMessage msg = new EngineMessage(
"org.jahia.engines.shared.BigText_Field.approvalWarning",
values);
