Get the jeditable editor working again

Author: AJ Christensen

chef-server-slice/app/controllers/nodes.rb

@@ -38,8 +38,11 @@ def show
     rescue Net::HTTPServerException => e
       raise NotFound, "Cannot load node #{params[:id]}"
     end
-
-    display @node
+    if request.xhr?
+      render JSON.pretty_generate(@node), :layout => false
+    else
+      display @node
+    end
   end
 
   def create
@@ -63,11 +66,7 @@ def update
     if @node
       @status = 202
       @node.save
-      if request.xhr?
-        render JSON.pretty_generate(@node), :layout => false
-      else
-        display @node
-      end   
+      partial :node, :node => @node
     else
       raise NotFound, "You must provide a Node to update"
     end
@@ -84,7 +83,7 @@ def destroy
       @status = 202
       display @node
     else
-      redirect(absolute_slice_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted succesfully" }, :permanent => true})
+      redirect(absolute_slice_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted succesfully" }, :permanent => false})
     end
   end
 

chef-server-slice/app/helpers/nodes_helper.rb

@@ -22,15 +22,15 @@ module NodesHelper
       def recipe_list(node)
         response = ""
         node.recipes.each do |recipe|
-          response << "<li>#{recipe}</li>"
+          response << "<li>#{recipe}</li>\n"
         end
         response
       end
 
       def attribute_list(node)
         response = ""
         node.each_attribute do |k,v|
-          response << "<li><b>#{k}</b>: #{v}</li>"
+          response << "<li><b>#{k}</b>: #{v}</li>\n"
         end
         response
       end

chef-server-slice/app/views/nodes/_node.html.haml

@@ -1,16 +1,23 @@
-- if session[:level] == :admin
-  .edit_area#node{:to_update => node.name}
-    %h2 Recipes
-    %ol
-      = recipe_list(node)
-    %h2 Attributes
-    %ol
-      = attribute_list(node)
-- else
-  #node
-    %h2 Recipes
-    %ol
-      = recipe_list(node)
-    %h2 Attributes
-    %ol
-      = attribute_list(node)
+%div{ :id => 'node', :class => "#{session[:level] == :admin ? 'edit_area' : 'non_edit_area'}",  :to_update => @node.name}
+  %table.table
+    %tr
+      %th.first Recipes
+      %th.last &nbsp
+    - if @node.recipes.empty?
+      %tr
+        %td{:colspan => 2} This node has no recipes applied, double click to add one.
+    - else
+      - @node.recipes.each_with_index do |recipe, index|
+        %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
+          %td{:colspan => 2}= recipe
+  %table.table
+    %tr
+      %th.first Attributes
+      %th.last &nbps
+    - if @node.attribute.empty?
+      %tr
+        %td{:colspan => 2} This node has no attributes, double click to add one.
+    - else
+      - @node.attribute.each_with_index do |attrib, index|
+        %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
+          %td{:colspan => 2, :style => 'overflow: auto'}= "<b>#{attrib[0]}</b>: #{attrib[1]}"

chef-server-slice/app/views/nodes/index.html.haml

@@ -4,15 +4,14 @@
     .inner
       %table.table
         %tr
-          %th.first Node Name
-          %th &nbsp
+          %th.first{:colspan => 2} Node Name
           %th Control
           %th.last &nbsp
-          - if @node_list.empty?
-            %tr
-              %td{:colspan => 4}= "You appear to have no nodes - try connecting one, or validating an existing #{link_to('registration', slice_url(:registrations))}"
-          - else
-            - @node_list.each_with_index do |node, index|
-              %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-                %td{:colspan => 2}= link_to node, slice_url(:node, { :id => node.gsub(/\./, "_" ) } )
-                %td= link_to "Delete", slice_url(:node, { :id => node.gsub(/\./, "_") }), :method => "delete", :confirm => "Are you sure? There is no undo."
+        - if @node_list.empty?
+          %tr
+            %td{:colspan => 4}= "You appear to have no nodes - try connecting one, or validating an existing #{link_to('registration', slice_url(:registrations))}"
+        - else
+          - @node_list.each_with_index do |node, index|
+            %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
+              %td{:colspan => 2}= link_to node, slice_url(:node, { :id => node.gsub(/\./, "_" ) } )
+              %td= link_to "Delete", slice_url(:node, { :id => node.gsub(/\./, "_") }), :method => "delete", :confirm => "Are you sure? There is no undo."

chef-server-slice/app/views/nodes/show.html.haml

@@ -1,6 +1,5 @@
-.block#block-text
+.block#block-tables
   .content
     %h2.title= "Node #{h @node.name}"
     .inner
-      %textarea#attrib_json_edit= JSON.pretty_generate(@node.attribute)
-      %textarea#recipe_json_edit= JSON.pretty_generate(@node.recipes)
+      = partial :node, :node => @node

chef-server-slice/public/javascripts/chef.js

@@ -49,7 +49,8 @@ $(document).ready(function(){
     submit : "Save",
     cancel : "Cancel",
     indicator : "Saving..",
-    loadurl : location.href + ".json",
+    loadurl : location.href,
+    tooltip : "Click to edit",
     type  : "textarea",
     height : 300
   });