shuber 2004/11/03 19:34:18 CET
Modified files:
war/src/java/org/jahia/webapps/timereporting DBServices.java
TimeReportHandler.java
Log:
Fix for JAHIA-199 : Timesheet comments should now be correctly saved when switching
back and forth to week view and back to day view. Now removed limitation that
prevented comment deletion.
Revision Changes Path
1.4 +11 -1
timereporting/war/src/java/org/jahia/webapps/timereporting/DBServices.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/java/org/jahia/webapps/timereporting/DBServices.java.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -5
timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java.diff?r1=1.3&r2=1.4&f=h
Index: DBServices.java
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/java/org/jahia/webapps/timereporting/DBServices.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBServices.java 3 Nov 2004 18:08:55 -0000 1.3
+++ DBServices.java 3 Nov 2004 18:34:18 -0000 1.4
@@ -414,7 +414,17 @@
hour.setDescription(description);
}
} else {
- hour.setDescription(description);
+ if ("".equals(description)) {
+ if ( (hour.getDescription() == null) ||
+ "".equals(hour.getDescription())) {
+ // do nothing in this case.
+ } else {
+ // this means we want to erase the previous value.
+ hour.setDescription(null);
+ }
+ } else {
+ hour.setDescription(description);
+ }
}
}
broker.store(hour);
Index: TimeReportHandler.java
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeReportHandler.java 3 Nov 2004 18:08:55 -0000 1.3
+++ TimeReportHandler.java 3 Nov 2004 18:34:18 -0000 1.4
@@ -1128,11 +1128,7 @@
: actId;
// DBServices.createHour(contextId, actId, period.getDate(j),
value, description);
- if(description.equals("") || (description==null)) {
- DBServices.createHour(contextId, actId, period.getDate(j), value,
null); }
- else {
- DBServices.createHour(contextId, actId, period.getDate(j), value,
description);
- }
+ DBServices.createHour(contextId, actId, period.getDate(j),
value, description);
counter.increment();
