You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2011/03/11 10:56:32 UTC
svn commit: r1080500 -
/esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala
Author: rhirsch
Date: Fri Mar 11 09:56:32 2011
New Revision: 1080500
URL: http://svn.apache.org/viewvc?rev=1080500&view=rev
Log:
[ESME-3336] Streams shows all pools rather than the pools in which I'm a member
Patch from Vladimir Ivanov
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala
Modified: esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala?rev=1080500&r1=1080499&r2=1080500&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/snippet/StreamDisplay.scala Fri Mar 11 09:56:32 2011
@@ -55,21 +55,24 @@ object StreamDisplay {
val filterResentInput = "filter_resent_input"
val filterPoolsInput = "filter_pools_input"
- val following = (AnyResender.toString, S.?("base_streams_resend_any")) ::
+ object following extends RequestVar[Seq[(String, String)]] (Nil)
+ object pools extends RequestVar[Seq[(String, String)]] (Nil)
+
+ def display(in: NodeSeq): NodeSeq = {
+
+ following.set((AnyResender.toString, S.?("base_streams_resend_any")) ::
(User.currentUser match {
case Full(u) => u.following.map(u => (u.id.is.toString, u.nickname.is) )
case _ => Nil
- })
-
- val pools = (PublicPool.toString, S.?("base_streams_pool_default")) ::
+ }))
+
+ pools.set((PublicPool.toString, S.?("base_streams_pool_default")) ::
(User.currentUser match {
case Full(u)=> Privilege.findViewablePools(u.id).map(
p => (p.toString, AccessPool.find(p).get.getName)).toList
case _ => Nil
- })
+ }))
- def display(in: NodeSeq): NodeSeq = {
-
val name = randomString(20)
def cometTimeline:NodeSeq = <lift:comet type="StreamTimeline" name={ name } />
@@ -79,7 +82,7 @@ object StreamDisplay {
bind("stream", in,
"cometTimeline" -> cometTimeline,
- "resent" -> ajaxSortedSelect(following, true, Empty,
+ "resent" -> ajaxSortedSelect(following.is, true, Empty,
u => {
for {
ta <- timelineActor
@@ -90,7 +93,7 @@ object StreamDisplay {
},
"id" -> resenderInput),
- "pools" -> ajaxSortedSelect(pools, true, Empty,
+ "pools" -> ajaxSortedSelect(pools.is, true, Empty,
p => {
for {
ta <- timelineActor