3 files changed, 7 insertions, 2 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 6fd000b..b56d779 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -49,6 +49,11 @@ class NodesController < ApplicationController
 
       redirect_to(edit_node_path(@node))
     else
+      @selected_kind = CccConventions::NODE_KINDS.key?(params[:kind]) ? params[:kind] : "generic"
+      if params[:parent_id].present?
+        @parent_id = params[:parent_id]
+        @parent_name = Node.find(@parent_id).title
+      end
       render :new
     end
   end
diff --git a/app/models/node.rb b/app/models/node.rb
index f15c908..7675ab6 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -17,7 +17,7 @@ class Node < ApplicationRecord
   after_save    :update_unique_names_of_children
 
   # Validations
-  validates_length_of     :slug, :within => 1..255,    :unless => -> { parent_id.nil? }
+  validates_length_of     :slug, :within => 1..255,    :unless => -> { parent_id.nil? || slug.blank? }
   validates_presence_of   :slug,                       :unless => -> { parent_id.nil? }
   validates_uniqueness_of :slug, :scope => :parent_id, :unless => -> { parent_id.nil? }
   validates_presence_of   :parent_id,                  :unless => -> { Node.root.nil? }
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 71f2fbf..afc632f 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -25,7 +25,7 @@
 
   <div class="node_description">Title</div>
   <div class="node_content">
-    <%= text_field_tag :title %>
+    <%= text_field_tag :title, nil, required: true %>
     <span class="field_hint">A URL slug will be generated from this automatically. You can review or adjust it afterward under the "metadata" section's Slug field.</span>
   </div>