diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/nodes_controller.rb | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 8d7d2ea..517506f 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb | |||
| @@ -19,7 +19,7 @@ class AdminController < ApplicationController | |||
| 19 | format.html | 19 | format.html |
| 20 | format.js do | 20 | format.js do |
| 21 | render( :json => @results.map do |node| | 21 | render( :json => @results.map do |node| |
| 22 | {:id => node.id, :title => node.title} | 22 | {:id => node.id, :title => node.title, :edit_path => node_path(node)} |
| 23 | end | 23 | end |
| 24 | ) | 24 | ) |
| 25 | 25 | ||
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 1c7278c..09d0c52 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb | |||
| @@ -40,14 +40,6 @@ class NodesController < ApplicationController | |||
| 40 | 40 | ||
| 41 | def show | 41 | def show |
| 42 | @page = Node.find(params[:id]).pages.last | 42 | @page = Node.find(params[:id]).pages.last |
| 43 | |||
| 44 | if @page | ||
| 45 | template = @page.valid_template | ||
| 46 | render( | ||
| 47 | :file => template, | ||
| 48 | :layout => "application" | ||
| 49 | ) | ||
| 50 | end | ||
| 51 | end | 43 | end |
| 52 | 44 | ||
| 53 | def edit | 45 | def edit |
