Changeset 2473

Timestamp:

Jul 31, 2006, 9:11:09 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #303: News items are not shown in View -> home page

Needed a check for null endDate.

File:

• trunk/www/my_base/index.jsp (modified) (1 diff)

trunk/www/my_base/index.jsp

@@ -122 +122 @@
   Expression today = Expressions.parameter("today");
   newsQuery.restrict(Restrictions.lteq(Hql.property("startDate"), today));
-  newsQuery.restrict(Restrictions.gteq(Hql.property("endDate"), today));
+  newsQuery.restrict(
+    Restrictions.or(
+      Restrictions.gteq(Hql.property("endDate"), today),
+      Restrictions.eq(Hql.property("endDate"), null)
+    )
+  );
   newsQuery.order(Orders.desc(Hql.property("newsDate")));
   newsQuery.setParameter("today", new Date(), Type.DATE);