[claw-cvs] r136 - in trunk/main/claw-demo: . src/backend src/frontend src/frontend/components

[Andrea Chiumenti]

Author: achiumenti
Date: Wed Nov 12 07:10:55 2008
New Revision: 136

Log:
demo update for recent package renaming

Modified:
   trunk/main/claw-demo/claw-demo.asd
   trunk/main/claw-demo/src/backend/packages.lisp
   trunk/main/claw-demo/src/frontend/components/edit-user.lisp
   trunk/main/claw-demo/src/frontend/main.lisp
   trunk/main/claw-demo/src/frontend/packages.lisp

Modified: trunk/main/claw-demo/claw-demo.asd
==============================================================================
--- trunk/main/claw-demo/claw-demo.asd	(original)
+++ trunk/main/claw-demo/claw-demo.asd	Wed Nov 12 07:10:55 2008
@@ -36,8 +36,8 @@
 (asdf:defsystem :claw-demo-backend
   :name "claw-demo-backend"
   :author "Andrea Chiumenti"
-  :description "Demo application for claw, backend part."
-  :depends-on (:clsql :clsql-postgresql :local-time :claw :closer-mop :split-sequence)
+  :description "Demo application for CLAW, backend part."
+  :depends-on (:clsql :clsql-postgresql :local-time :claw-as :closer-mop :split-sequence)
   :components ((:module src
                         :components ((:module backend
                                               :components ((:file "packages")
@@ -49,8 +49,8 @@
 (asdf:defsystem :claw-demo-frontend
   :name "claw-demo-frontend"
   :author "Andrea Chiumenti"
-  :description "Demo application for claw, frontend part."
-  :depends-on (:local-time :claw :hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence)
+  :description "Demo application for CLAW, frontend part."
+  :depends-on (:local-time :claw-as :claw-hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence)
   :components ((:module src
                         :components ((:module frontend
                                               :components ((:file "packages")

Modified: trunk/main/claw-demo/src/backend/packages.lisp
==============================================================================
--- trunk/main/claw-demo/src/backend/packages.lisp	(original)
+++ trunk/main/claw-demo/src/backend/packages.lisp	Wed Nov 12 07:10:55 2008
@@ -31,7 +31,7 @@
 
 
 (defpackage :claw-demo-backend
-  (:use :cl :clsql :clsql-sys :clsql-postgresql :local-time :claw :closer-mop :split-sequence)
+  (:use :cl :clsql :clsql-sys :clsql-postgresql :local-time :claw-as :closer-mop :split-sequence)
   (:shadowing-import-from :local-time 
                           :timezone 
                           :decode-duration

Modified: trunk/main/claw-demo/src/frontend/components/edit-user.lisp
==============================================================================
--- trunk/main/claw-demo/src/frontend/components/edit-user.lisp	(original)
+++ trunk/main/claw-demo/src/frontend/components/edit-user.lisp	Wed Nov 12 07:10:55 2008
@@ -123,6 +123,7 @@
                          :accessor 'user-active))
      (djxpassword-validator> :id "password"
                              :class "label password"
+                             :required nil
                              :visit-object obj
                              :label "Password"
                              :type "password"
@@ -183,12 +184,13 @@
 (defmethod edit-user-save ((obj edit-user))
   (let ((id (htcomponent-client-id obj))
         (user (edit-user-user obj))
-        (roles (find-roles-by-ids :ids (edit-user-assigned-roles obj))))
+        (roles (find-roles-by-ids :ids (edit-user-assigned-roles obj)))
+        (password (edit-user-password obj)))
     (handler-case
         (progn
-          (log-message :info "password ~a" (edit-user-password obj))
-          (setf (user-roles user) roles
-                (user-password user) (edit-user-password obj))
+          (setf (user-roles user) roles)
+          (when password
+            (setf (user-password user) password))
           (update-db-item user)
           (setf (edit-user-password obj) nil))
       (clsql-sys:sql-database-error (cond)

Modified: trunk/main/claw-demo/src/frontend/main.lisp
==============================================================================
--- trunk/main/claw-demo/src/frontend/main.lisp	(original)
+++ trunk/main/claw-demo/src/frontend/main.lisp	Wed Nov 12 07:10:55 2008
@@ -43,8 +43,10 @@
                                       :address "localhost"
                                       :port 4242
                                       :sslport 4343
+                                      #|
                                       :ssl-certificate-file #P "/etc/apache2/ssl/server.crt"
-                                      :ssl-privatekey-file #P "/etc/apache2/ssl/server.key"))
+                                      :ssl-privatekey-file #P "/etc/apache2/ssl/server.key"
+|#))
 
 (defvar *sm* (make-instance 'default-session-manager))
 

Modified: trunk/main/claw-demo/src/frontend/packages.lisp
==============================================================================
--- trunk/main/claw-demo/src/frontend/packages.lisp	(original)
+++ trunk/main/claw-demo/src/frontend/packages.lisp	Wed Nov 12 07:10:55 2008
@@ -31,5 +31,5 @@
 
 
 (defpackage :claw-demo-frontend
-  (:use :cl :local-time :claw :hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence)
+  (:use :cl :local-time :claw-as :claw-hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence)
   (:documentation "Frontend layer for demo application for CLAW"))
\ No newline at end of file