Preload page titles for the sitemap, and order containers before leaves

1 files changed, 5 insertions, 9 deletions

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 5884c8cd..48f44f8b 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -1,15 +1,11 @@
 module NodesHelper
   
   def title_for_node node
-    if node.head
-      node.head.title
-    else
-      if not node.draft or not node.draft.title
-        logger.error "Missing title in node #{node.id}"
-        return "NO TITLE"
-      end
-      node.draft.title
-    end
+    return node.head.title if node.head&.title.present?
+    return node.draft.title if node.draft&.title.present?
+
+    logger.error "Missing title in node #{node.id}"
+    t("admin.common.no_title")
   end
   
   def truncated_title_for_node node