|
89 | 89 | (not config/publishing?)) |
90 | 90 | (let [class? (string/starts-with? q "#") |
91 | 91 | class-name (get-class-from-input q) |
92 | | - class (ldb/class? (db/get-case-page class-name))] |
| 92 | + class (let [class (db/get-case-page class-name)] |
| 93 | + (when (ldb/class? class) |
| 94 | + class))] |
93 | 95 | (->> [{:text (cond |
94 | 96 | class "Configure tag" |
95 | 97 | class? "Create tag" |
96 | 98 | :else "Create page") |
97 | 99 | :icon "new-page" |
98 | 100 | :icon-theme :gray |
99 | | - :info (if class? |
100 | | - (let [class-name (get-class-from-input q) |
101 | | - class (db/get-case-page class-name)] |
102 | | - (if class |
103 | | - (str "Configure #" class-name) |
104 | | - (str "Create tag called '" class-name "'"))) |
| 101 | + :info (cond |
| 102 | + class |
| 103 | + (str "Configure #" class-name) |
| 104 | + class? |
| 105 | + (str "Create tag called '" class-name "'") |
| 106 | + :else |
105 | 107 | (str "Create page called '" q "'")) |
106 | | - :source-create :page}] |
| 108 | + :source-create :page |
| 109 | + :class class}] |
107 | 110 | (remove nil?))))) |
108 | 111 |
|
109 | 112 | ;; Take the results, decide how many items to show, and order the results appropriately |
|
564 | 567 | create-whiteboard? (= :whiteboard (:source-create item)) |
565 | 568 | create-page? (= :page (:source-create item)) |
566 | 569 | class (when create-class? (get-class-from-input @!input))] |
567 | | - (p/let [result (cond |
568 | | - create-class? |
569 | | - (db-page-handler/<create-class! class |
570 | | - {:redirect? false}) |
571 | | - create-whiteboard? (whiteboard-handler/<create-new-whiteboard-and-redirect! @!input) |
572 | | - create-page? (page-handler/<create! @!input {:redirect? true}))] |
573 | | - (shui/dialog-close! :ls-dialog-cmdk) |
574 | | - (when (and create-class? result) |
575 | | - (state/pub-event! [:dialog/show-block result {:tag-dialog? true}]))))) |
| 570 | + (if (and (= (:text item) "Configure tag") (:class item)) |
| 571 | + (state/pub-event! [:dialog/show-block (:class item) {:tag-dialog? true}]) |
| 572 | + (p/let [result (cond |
| 573 | + create-class? |
| 574 | + (db-page-handler/<create-class! class |
| 575 | + {:redirect? false}) |
| 576 | + create-whiteboard? (whiteboard-handler/<create-new-whiteboard-and-redirect! @!input) |
| 577 | + create-page? (page-handler/<create! @!input {:redirect? true}))] |
| 578 | + (shui/dialog-close! :ls-dialog-cmdk) |
| 579 | + (when (and create-class? result) |
| 580 | + (state/pub-event! [:dialog/show-block (:class item) {:tag-dialog? true}])))))) |
576 | 581 |
|
577 | 582 | (defn- get-filter-user-input |
578 | 583 | [input] |
|
0 commit comments