Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms

2 files changed, 12 insertions, 3 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 706cfcd..d548a34 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -10,7 +10,7 @@ class ContentController < ApplicationController
     
     @page = Node.find_page(path)
     
-    if @page
+    if @page and @page.public?
      template = @page.valid_template
 
       render(
@@ -25,4 +25,5 @@ class ContentController < ApplicationController
     end
     
   end
+
 end
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 81ead62..0c961b7 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -32,7 +32,7 @@ class NodesController < ApplicationController
     
     if parent and @node.save
       @node.move_to_child_of parent
-      redirect_to(@node)
+      redirect_to(edit_node_path(@node))
     else
       @node.errors.add("Parent node")
       render :action => :new
@@ -40,7 +40,15 @@ class NodesController < ApplicationController
   end
 
   def show
-    @nodes = Node.find(params[:id]).children
+    @page = Node.find(params[:id]).draft
+    
+    if @page
+     template = @page.valid_template
+     render(
+       :file => template,
+       :layout => "application"
+     )
+    end
   end
 
   def edit