incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r933104 - in /incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib: AccessPoolMgr.scala ActionMgr.scala AuthMgr.scala StreamMgr.scala TrackMgr.scala
Date Mon, 12 Apr 2010 06:22:18 GMT
Author: rhirsch
Date: Mon Apr 12 06:22:18 2010
New Revision: 933104

URL: http://svn.apache.org/viewvc?rev=933104&view=rev
Log:
[ESME-126] Remove delete icons from tables

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AuthMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/TrackMgr.scala

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=933104&r1=933103&r2=933104&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Mon
Apr 12 06:22:18 2010
@@ -180,7 +180,7 @@ object AccessPoolMgr {
     }
 
     bind("edit", in,
-         "pool" -> ajaxSelect(adminPools, Empty, p => {pool = p;
+         "pool" -%> ajaxSelect(adminPools, Empty, p => {pool = p;
                                                        poolId.set(p.toLong);
                                                        redisplay() //redisplay pooluser and
pool detail
                                                        },

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala?rev=933104&r1=933103&r2=933104&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala Mon Apr
12 06:22:18 2010
@@ -94,10 +94,8 @@ object ActionMgr {
                                                    "test" -> i.testText,
                                                    "action" -> i.actionText,
                                                    "createdDate" -> getDateHtml(i.createdDate),
-                                                   "remove" -> 
-                                                   ((bt: NodeSeq) => 
-                  ajaxButton(bt, () => {i.removed(true).save ; updateSpan() & DisplayMessage("messages",
<b>{S.?("base_action_msg_removed",i.name)}</b>,  3 seconds, 3 seconds); }))
-              ))))
+                                                   "remove" -%> a(() => {i.removed(true).save
; updateSpan() & DisplayMessage("messages", <b>{S.?("base_action_msg_removed", i.name)}</b>,
 3 seconds, 3 seconds)}, Text("delete"))
+                           ))))
    
 
     }

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AuthMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AuthMgr.scala?rev=933104&r1=933103&r2=933104&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AuthMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AuthMgr.scala Mon Apr 12
06:22:18 2010
@@ -90,10 +90,8 @@ object AuthMgr {
                                                    "description" -> i.description.is,
                                                    "uniqueId" -> i.uniqueId.is,
                                                    "createdDate" -> getDateHtml(i.createdDate),
-                                                   "revoke" -> 
-                                                   ((bt: NodeSeq) => 
-                  ajaxButton(bt, () => {i.delete_! ; updateSpan() & DisplayMessage("messages",
<b>{S.?("base_token_msg_removed", i.description.is)}</b>,  3 seconds, 3 seconds)}))
-              ))))
+                                                   "revoke" -%> a(() => {i.delete_!
; updateSpan() & DisplayMessage("messages", <b>{S.?("base_token_msg_removed", i.description.is)}</b>,
 3 seconds, 3 seconds)}, Text("revoke"))
+             ))))
     }
 
     def updateSpan(): JsCmd = SetHtml(spanName, doRender())

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=933104&r1=933103&r2=933104&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala Mon Apr
12 06:22:18 2010
@@ -71,6 +71,7 @@ object StreamMgr {
     val spanName = S.attr("the_id") openOr "StreamSpan"
     // get the current user
     val user = User.currentUser
+    println("displayStream"); 
 
     // bind the dynamic content to the incoming nodeseq
     def doRender(): NodeSeq = {
@@ -148,20 +149,20 @@ object StreamMgr {
          "resent" -> ajaxSelect(following,
                                 Empty,
                                 u => {resender = u.toLong
-                                      redisplay() & DisplayMessage("messages", <b>{S.?("base_streams_filter_pool_active")}</b>,
 3 seconds, 3 seconds)},
+                                      redisplay()},
                                 "id" -> resenderInput),
          "pools" -> ajaxSelect(pools,
                                Empty,
                                p => {pool = p.toLong
-                                      redisplay() & DisplayMessage("messages", <b>{S.?("base_streams_filter_pool_active")}</b>,
 3 seconds, 3 seconds)},
+                                     redisplay()},
                                "id" -> poolInput),
          "filterResent" -> ajaxCheckbox(false,
                                         r_? => {filterResent = r_?
-                                                 redisplay() & DisplayMessage("messages",
<b>{S.?("base_streams_filter_pool")}</b>,  3 seconds, 3 seconds)},
+                                                 redisplay()},
                                         "id" -> filterResentInput),
          "filterPools" -> ajaxCheckbox(false,
                                        p_? => {filterPools = p_?
-                                       redisplay() & DisplayMessage("messages", <b>{S.?("base_streams_filter_pool")}</b>,
 3 seconds, 3 seconds)},
+                                       redisplay()},
                                        "id" -> filterPoolsInput)
     )
     

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/TrackMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/TrackMgr.scala?rev=933104&r1=933103&r2=933104&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/TrackMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/TrackMgr.scala Mon Apr
12 06:22:18 2010
@@ -62,12 +62,8 @@ object TrackMgr {
     // get the span name to update
     val spanName = S.attr("the_id") openOr "TrackSpan"
     // get the current user
-    //  ajaxButton(bt, () => {i.removed(true).save ; updateSpan()}))
-    //  ajaxButton(bt, () => {ModalDialog(<lift:embed what="/info_view/tag"/>)}))
-
-    // ajaxButton(bt, () => {ModalDialog(<lift:embed what="/tag"/>)}))
     val user = User.currentUser
-
+    
     // bind the dynamic content to the incoming nodeseq
     def doRender(): NodeSeq =
     Tracking.findAll(By(Tracking.user, user), By(Tracking.removed, false),
@@ -79,9 +75,7 @@ object TrackMgr {
                                                    "pattern" -> i.pattern,
                                                    "enabled" -> ajaxCheckbox(!i.disabled,
                                                                              e => {i.disabled(!e).save;
 Noop} ),
-                                                   "remove" -> 
-                                                   ((bt: NodeSeq) => 
-                  ajaxButton(bt, () => {i.removed(true).save ; updateSpan() & DisplayMessage("messages",
<b>{S.?("base_track_msg_removed", lst)}</b>,  3 seconds, 3 seconds)}))
+                                                    "remove" -%> a(() => {i.removed(true).save
; updateSpan() & DisplayMessage("messages", <b>{S.?("base_track_msg_removed", i.pattern)}</b>,
 3 seconds, 3 seconds)}, Text("delete"))
               ))))
     }
 



Mime
View raw message