浏览代码

fix: more rename sanity

Junyi Du 3 年之前
父节点
当前提交
a64880e61a
共有 3 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      src/main/frontend/db/model.cljs
  2. 3 3
      src/main/frontend/handler/page.cljs
  3. 1 0
      src/main/frontend/util/page_property.cljs

+ 1 - 1
src/main/frontend/db/model.cljs

@@ -1429,7 +1429,7 @@
   "Accepts both sanitized and unsanitized namespaces"
   "Accepts both sanitized and unsanitized namespaces"
   [repo namespace]
   [repo namespace]
   (assert (string? namespace))
   (assert (string? namespace))
-  (let [namespace (string/lower-case namespace)]
+  (let [namespace (util/page-name-sanity-lc namespace)]
     (d/q
     (d/q
       '[:find [(pull ?c [:db/id :block/name :block/original-name
       '[:find [(pull ?c [:db/id :block/name :block/original-name
                          :block/namespace
                          :block/namespace

+ 3 - 3
src/main/frontend/handler/page.cljs

@@ -388,10 +388,10 @@
         (d/transact! (db/get-conn repo false) page-txs)
         (d/transact! (db/get-conn repo false) page-txs)
 
 
         (when (not= new-page-name new-name)
         (when (not= new-page-name new-name)
-          (page-property/add-property! new-name :title new-name))
+          (page-property/add-property! new-page-name :title new-name))
 
 
         (when (and file (not journal?))
         (when (and file (not journal?))
-          (rename-file! file new-name (fn [] nil)))
+          (rename-file! file new-file-name (fn [] nil)))
 
 
         (rename-update-refs! page old-original-name new-name)
         (rename-update-refs! page old-original-name new-name)
 
 
@@ -451,7 +451,7 @@
   "Only accepts unsanitized names"
   "Only accepts unsanitized names"
   [repo old-name new-name]
   [repo old-name new-name]
   (let [pages (db/get-namespace-pages repo old-name)
   (let [pages (db/get-namespace-pages repo old-name)
-        page (db/pull [:block/name (string/lower-case old-name)])
+        page (db/pull [:block/name (util/page-name-sanity-lc old-name)])
         pages (cons page pages)]
         pages (cons page pages)]
     (doseq [{:block/keys [name original-name]} pages]
     (doseq [{:block/keys [name original-name]} pages]
       (let [old-page-title (or original-name name)
       (let [old-page-title (or original-name name)

+ 1 - 0
src/main/frontend/util/page_property.cljs

@@ -48,6 +48,7 @@
    content kvs))
    content kvs))
 
 
 (defn add-property!
 (defn add-property!
+  "Sanitized page-name, unsanitized key / value"
   [page-name key value]
   [page-name key value]
   (when-let [page (db/pull [:block/name (string/lower-case page-name)])]
   (when-let [page (db/pull [:block/name (string/lower-case page-name)])]
     (let [repo (state/get-current-repo)
     (let [repo (state/get-current-repo)