diff options
Diffstat (limited to 'webapps/ldapadmin')
| -rw-r--r-- | webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs | 64 | ||||
| -rw-r--r-- | webapps/ldapadmin/site.lisp | 8 |
2 files changed, 31 insertions, 41 deletions
diff --git a/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs b/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs index 2a6d489..649daf7 100644 --- a/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs +++ b/webapps/ldapadmin/clojurescript/ldapadmin/src/core.cljs @@ -72,33 +72,35 @@ (hiccups/defhtml template-message [message] [:div {:class "alert alert-success"} message]) -(defn maybe-error [jsonobj] - (let [errormsg (get jsonobj "errormsg")] - (cond (empty? errormsg) - (dommy/set-style! (dommy/sel1 :#errormsg) :display "none") - :else - (do - (dommy/set-style! (dommy/sel1 :#errormsg) :display "block") - (dommy/set-html! (dommy/sel1 :#errormsg) - (template-error errormsg)))))) - (defn maybe-message [jsonobj] - (let [message (get jsonobj "message")] - (cond (empty? message) - (dommy/set-style! (dommy/sel1 :#message) :display "none") - :else - (do - (dommy/set-style! (dommy/sel1 :#message) :display "block") - (dommy/set-html! (dommy/sel1 :#message) - (template-message message)))))) + (when (get jsonobj "locationP") + (let [message (get jsonobj "message")] + (cond (empty? message) + (dommy/set-style! (dommy/sel1 :#message) :display "none") + :else + (do + (dommy/set-style! (dommy/sel1 :#message) :display "block") + (dommy/set-html! (dommy/sel1 :#message) + (template-message message))))))) + +(defn maybe-error [jsonobj] + (when (get jsonobj "locationP") + (let [errormsg (get jsonobj "errormsg")] + (cond (empty? errormsg) + (dommy/set-style! (dommy/sel1 :#errormsg) :display "none") + :else + (do + (dommy/set-style! (dommy/sel1 :#errormsg) :display "block") + (dommy/set-html! (dommy/sel1 :#errormsg) + (template-error errormsg))))))) (defn notifications [jsonobj] - (maybe-error jsonobj) - (maybe-message jsonobj)) + (maybe-message jsonobj) + (maybe-error jsonobj)) (defn auth-notifications [jsonobj] (cond (empty? (get jsonobj "errormsg")) - (maybe-message jsonobj) + (notifications jsonobj) :else (do (render-home "" (get jsonobj "errormsg")) @@ -268,14 +270,12 @@ (defn handler-login-authenticate [response] (let [jsonobj (js->clj (js/JSON.parse response))] (cond (get jsonobj "errormsg") - (do - (notifications jsonobj) - (render-login)) + (goto-location "/login") (get jsonobj "message") (do (dommy/set-html! (dommy/sel1 :#location) "/inetorg/view") - (render-inetorg-view (get jsonobj "message") ""))) - (render-menu))) + (render-inetorg-view) + (render-menu))))) (defn render-login-authenticate [] (POST "/login/authenticate" {:format :raw @@ -320,9 +320,9 @@ :data-dismiss "modal"} [:span {:class "glyphicon glyphicon-remove"}] "Cancel"]]]]] - [:div {:id "delete" + [:div {:id "delete" :class "modal fade" - :role "dialog"} + :role "dialog"} [:div {:class "modal-dialog"} [:div {:class "modal-content"} [:div {:class "modal-header"} @@ -346,14 +346,8 @@ (dommy/set-html! (dommy/sel1 :#body) (template-inetorg-view jsonobj)) (render-inetorg-view-search))) -(defn render-inetorg-view - ([] +(defn render-inetorg-view [] (GET "/inetorg/view" {:handler handler-inetorg-view})) - ([message errormsg] - (POST "/inetorg/view" {:format :raw - :params {:message message - :errormsg errormsg} - :handler handler-inetorg-view}))) ;; inetorg-view-search diff --git a/webapps/ldapadmin/site.lisp b/webapps/ldapadmin/site.lisp index 891c9f9..eb644bd 100644 --- a/webapps/ldapadmin/site.lisp +++ b/webapps/ldapadmin/site.lisp @@ -55,12 +55,9 @@ (defmacro .logout () `(logout-json)) -(defmacro .inetorg-view-get () +(defmacro .inetorg-view () `(inetorg-view-json)) -(defmacro .inetorg-view-post () - `(inetorg-view-json message errormsg)) - (defmacro .inetorg-view-search () `(inetorg-view-search-json)) @@ -93,8 +90,7 @@ (define-endpoint :get "/login" () .login) (define-endpoint :post "/login/authenticate" ((dn :parameter-type 'string) (password :parameter-type 'string)) .login-authenticate) (define-endpoint :get "/logout" () .logout) -(define-endpoint :get "/inetorg/view" () .inetorg-view-get) -(define-endpoint :post "/inetorg/view" ((message :parameter-type 'string) (errormsg :parameter-type 'string)) .inetorg-view-post) +(define-endpoint :get "/inetorg/view" () .inetorg-view) (define-endpoint :get "/inetorg/view/search" () .inetorg-view-search) (define-endpoint :post "/inetorg/view/results" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string) (businesscategory :parameter-type 'string)) .inetorg-view-results) (define-endpoint :post "/inetorg/modify" ((cn :parameter-type 'string)) .inetorg-modify) |