meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge order

Browse source
This commit is contained in:
jem 2020-02-17 20:33:52 +01:00
parent ccf27e641d
commit 5ac6cfbcf3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cryogen_core/classpath_able_io.clj
View file

@ -83,7 +83,7 @@
cp-resource-map (if from-cp cp-resource-map (if from-cp
(apply merge (map virtual-path-map (cp/get-resources base-path paths))) (apply merge (map virtual-path-map (cp/get-resources base-path paths)))
{}) {})
resulting-map (merge fs-resource-map cp-resource-map)] resulting-map (merge cp-resource-map fs-resource-map)]
(if (empty? resulting-map) (if (empty? resulting-map)
[] []
(vals resulting-map)))) (vals resulting-map))))

3
src/cryogen_core/compiler.clj
View file

@ -521,7 +521,8 @@
klipsified-pages (map klipsify (read-pages config)) klipsified-pages (map klipsify (read-pages config))
modelled-pages (cond modelled-pages (cond
(= page-model :flat) klipsified-pages (= page-model :flat) klipsified-pages
(= page-model :hierarchic) (hierarchic/build-hierarchic-map page-root-uri klipsified-pages)) (= page-model :hierarchic)
(hierarchic/build-hierarchic-map page-root-uri klipsified-pages))
home-page (->> modelled-pages home-page (->> modelled-pages
(filter #(boolean (:home? %))) (filter #(boolean (:home? %)))
(first)) (first))