Fixed 2 bugs on schema reloading

html · html · commit 0925c8da409b · 2016-06-25T15:35:22.000+03:00
diff --git a/model-description.lisp b/model-description.lisp
@@ -18,10 +18,7 @@
   (list :title (model-description-title model)
         :name (model-description-name model)
         :fields 
-        (loop for i in (sort 
-                         (find-by-values 'field-description :model model)
-                         #'string<-by-chars
-                         :key #'field-description-title)
+        (loop for i in (find-by-values 'field-description :model model)
               collect (dump-field-description i))))
 
 (defvar *schema-file* (merge-pathnames 
diff --git a/version.lisp-expr b/version.lisp-expr
@@ -1 +1 @@
-"0.8.4"
+"0.8.5"
diff --git a/weblocks-cms.lisp b/weblocks-cms.lisp
@@ -68,7 +68,7 @@
                                     :name (getf i :name)
                                     :title (getf i :title)
                                     :type (getf i :type)
-                                    :type-data (getf i :type-data)
+                                    :type-data (or (getf i :type-data) (getf i :options))
                                     :model model-descr)))))
     (warn "Description db data not generated for class ~A, store is not yet opened" (getf description :name))))
 
