Changeset 7394 for trunk/www/main.jsp

Timestamp:

Jun 9, 2017, 2:23:58 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2085: Sticky news

Various places where news are displyed have been updated to sort the news with the "sticky" flag set first. The sticky news item are displayed with a different background color and a "paperclip" icon.

The login page has also been modified to show all sticky news even if there are more than 10 items which was the limit before.

File:

• trunk/www/main.jsp (modified) (5 diffs)

trunk/www/main.jsp

@@ -37 +37 @@
   import="net.sf.basedb.core.News"
   import="net.sf.basedb.core.ItemQuery"
-  import="net.sf.basedb.core.ItemResultList"
+  import="net.sf.basedb.core.ItemResultIterator"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
@@ -78 +78 @@
   String broadcastMessage = (String)application.getAttribute("broadcast.message");
   boolean denyLogin = Boolean.TRUE.equals(application.getAttribute("broadcast.deny-login"));
-  ItemResultList<News> news = null;
+  ItemResultIterator<News> news = null;
   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext);
   ExtensionsInvoker<LoginFormAction> invoker = (ExtensionsInvoker<LoginFormAction>)ExtensionsControl.useExtensions(jspContext, "net.sf.basedb.clients.web.login-form");
@@ -242 +242 @@
       {
         %>
-        <div class="item">
+        <div class="item note sticky">
           <div class="headline">
-            <base:icon image="warning.png" />
             <span class="date"><%=dateFormatter.format(new Date())%></span>
             <%=HTML.encodeTags(broadcastTitle)%><%=denyLogin ? " (login disabled)" : "" %>
@@ -254 +253 @@
       
       ItemQuery<News> query = News.getQuery();
+      query.order(Orders.desc(Hql.property("sticky")));
       query.order(Orders.desc(Hql.property("newsDate")));
       query.order(Orders.desc(Hql.property("id")));
       query.setCacheResult(true);
       query.setReturnTotalCount(true);
-      query.setMaxResults(10);
-      news = query.list(dc);
-      for (News n : news)
-      {
-        %>
-        <div class="item">
+      news = query.iterate(dc);
+      int numListed = 0;
+      while (news.hasNext())
+      {
+        News n = news.next();
+        if (numListed >= 10 && !n.isSticky()) break;
+        %>
+        <div class="item <%=n.isSticky() ? "note sticky" : ""%>">
           <div class="headline">
             <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
@@ -271 +273 @@
         </div>
         <%
-      }
-      if (news.getTotalCount() > 10)
+        numListed++;
+      }
+      if (numListed < news.getTotalCount())
       {
         %>
         <base:icon image="bullet.png" /><a href="info/news.jsp" 
-          title="Show older news..."><%=news.getTotalCount()-10%> more</a>
+          title="Show older news..."><%=news.getTotalCount()-numListed%> more</a>
         <%
       }