You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/09/11 13:22:11 UTC
svn commit: r1168199 - in /esme/trunk/server/src:
main/scala/org/apache/esme/api/API2.scala
test/scala/org/apache/esme/api/API2Test.scala
Author: esjewett
Date: Sun Sep 11 11:22:11 2011
New Revision: 1168199
URL: http://svn.apache.org/viewvc?rev=1168199&view=rev
Log:
[ESME-245] Fix changeAction method so that the enabled parameter is no longer required.
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
Modified: esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=1168199&r1=1168198&r2=1168199&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Sun Sep 11 11:22:11 2011
@@ -513,7 +513,7 @@ object API2 extends ApiHelper with XmlHe
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
for (user <- User.currentUser;
action <- findAction(actionId);
- enabled <- S.param("enabled").map(toBoolean) ?~ S.?("base_rest_api_err_missing_param", "enable"))
+ val enabled = S.param("enabled").map(toBoolean).openOr(action.enabled))
yield {
action.disabled(!enabled).save
(200,Map(),Full(action.toXml))
Modified: esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=1168199&r1=1168198&r2=1168199&view=diff
==============================================================================
--- esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Sun Sep 11 11:22:11 2011
@@ -546,24 +546,31 @@ object Api2Specs extends Specification w
}
}
- /*
- * "/user/actions/ACTIONID PUT" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.put("user/actions/1","enabled"->0)
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- post("user/actions/1","enabled"->0)) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+/* "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1", "enabled" -> "0")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no enabled parameter" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- put("user/actions/1", "enabled" -> "0")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * } */
// Brittle, brittle, brittle
"/user/actions/ACTIONID DELETE" in {