second round of public beta bugfixes:
- fixed a bug in navigation between conferences via post links - fixed the "your post is 'new'" bug (this was actually another bug, in postNewMessage()) - some other stuff
This commit is contained in:
@@ -20,6 +20,7 @@ package com.silverwrist.venice.servlets.format;
|
||||
import java.util.*;
|
||||
import javax.servlet.*;
|
||||
import javax.servlet.http.*;
|
||||
import org.apache.log4j.*;
|
||||
import com.silverwrist.util.StringUtil;
|
||||
import com.silverwrist.venice.core.*;
|
||||
|
||||
@@ -30,6 +31,8 @@ public class TopicPosts implements JSPRender
|
||||
*--------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
private static Category logger = Category.getInstance(TopicPosts.class);
|
||||
|
||||
// Attribute name for request attribute
|
||||
protected static final String ATTR_NAME = "com.silverwrist.venice.content.TopicPosts";
|
||||
|
||||
@@ -60,6 +63,10 @@ public class TopicPosts implements JSPRender
|
||||
TopicContext topic, int first, int last, boolean read_new, boolean show_advanced)
|
||||
throws DataException, AccessError
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("TopicPosts: sig=" + sig.getSIGID() + ", conf=" + conf.getConfID() + ", topic="
|
||||
+ topic.getTopicNumber() + ", range=[" + first + ", " + last + "], rnm=" + read_new
|
||||
+ ", shac=" + show_advanced);
|
||||
this.engine = engine;
|
||||
this.sig = sig;
|
||||
this.conf = conf;
|
||||
@@ -70,9 +77,12 @@ public class TopicPosts implements JSPRender
|
||||
this.unread = topic.getUnreadMessages();
|
||||
if (read_new)
|
||||
topic.setUnreadMessages(0);
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug(this.unread + " unread messages");
|
||||
this.messages = topic.getMessages(first,last);
|
||||
this.visit_order = TopicVisitOrder.retrieve(request.getSession(true),conf.getConfID());
|
||||
visit_order.visit(topic.getTopicNumber());
|
||||
if (visit_order!=null)
|
||||
visit_order.visit(topic.getTopicNumber());
|
||||
List aliases = conf.getAliases();
|
||||
topic_stem = (String)(aliases.get(0)) + "." + String.valueOf(topic.getTopicNumber()) + ".";
|
||||
|
||||
@@ -173,7 +183,10 @@ public class TopicPosts implements JSPRender
|
||||
|
||||
public int getNextTopicNumber()
|
||||
{
|
||||
return visit_order.getNext();
|
||||
if (visit_order!=null)
|
||||
return visit_order.getNext();
|
||||
else
|
||||
return -1;
|
||||
|
||||
} // end getNextTopicNumber
|
||||
|
||||
@@ -203,8 +216,9 @@ public class TopicPosts implements JSPRender
|
||||
public String getNextLocator()
|
||||
{
|
||||
StringBuffer buf = new StringBuffer("sig=");
|
||||
buf.append(sig.getSIGID()).append("&conf=").append(conf.getConfID()).append("&top=");
|
||||
buf.append(visit_order.getNext());
|
||||
buf.append(sig.getSIGID()).append("&conf=").append(conf.getConfID());
|
||||
if (visit_order!=null)
|
||||
buf.append("&top=").append(visit_order.getNext());
|
||||
return buf.toString();
|
||||
|
||||
} // end getNextLocator
|
||||
@@ -257,7 +271,10 @@ public class TopicPosts implements JSPRender
|
||||
|
||||
public boolean canDoNextTopic()
|
||||
{
|
||||
return visit_order.isNext();
|
||||
if (visit_order!=null)
|
||||
return visit_order.isNext();
|
||||
else
|
||||
return false;
|
||||
|
||||
} // end canDoNextTopic
|
||||
|
||||
|
||||
Reference in New Issue
Block a user