From fb39d841a720d74b6fd4d5e82d80e5426d6770c2 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sun, 24 Oct 2010 22:31:57 +0200
Subject: [PATCH] migrate editing a context and refactor project with it

---
 app/controllers/contexts_controller.rb    | 16 +++++---
 app/controllers/projects_controller.rb    |  3 ++
 app/helpers/application_helper.rb         |  6 +++
 app/views/contexts/_context_form.rhtml    | 20 +++++++---
 app/views/contexts/_context_listing.rhtml | 22 ++++++-----
 app/views/contexts/edit.js.erb            | 21 ++++++++++
 app/views/contexts/edit.js.rjs            |  4 --
 app/views/contexts/update.js.erb          | 47 +++++++++++++++++++++++
 app/views/contexts/update.js.rjs          |  9 -----
 app/views/projects/_project_form.rhtml    |  2 +-
 app/views/projects/edit.js.erb            | 22 ++++++++---
 app/views/projects/update.js.erb          |  6 +--
 public/javascripts/application.js         | 28 +++++++++++++-
 13 files changed, 163 insertions(+), 43 deletions(-)
 create mode 100644 app/views/contexts/edit.js.erb
 delete mode 100644 app/views/contexts/edit.js.rjs
 create mode 100644 app/views/contexts/update.js.erb
 delete mode 100644 app/views/contexts/update.js.rjs

diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index 63985245..025d7493 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -91,13 +91,18 @@ class ContextsController < ApplicationController
     @original_context_hidden = @context.hidden?
     @context.attributes = params["context"]
 
-    if @context.save
+    @saved = @context.save
+
+    if @saved
       if boolean_param('wants_render')
-        @context_state_changed = (@original_context_hidden != @context.hidden?)
-        @new_state = (@context.hidden? ? "hidden" : "active") if @context_state_changed
+        @state_changed = (@original_context_hidden != @context.hidden?)
+        @new_state = (@context.hidden? ? "hidden" : "active") if @state_changed
         respond_to do |format|
           format.js
         end
+
+        # TODO is this param ever used? is this dead code?
+        
       elsif boolean_param('update_context_name')
         @contexts = current_user.projects
         render :template => 'contexts/update_context_name.js.rjs'
@@ -106,8 +111,9 @@ class ContextsController < ApplicationController
         render :text => success_text || 'Success'
       end
     else
-      notify :warning, "Couldn't update new context"
-      render :text => ""
+      respond_to do |format|
+        format.js
+      end
     end
   end
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 338935b5..d1a8c9e2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -134,6 +134,9 @@ class ProjectsController < ApplicationController
         init_data_for_sidebar
         render :template => 'projects/update.js.erb'
         return
+
+      # TODO: are these params ever set? or is this dead code?
+
       elsif boolean_param('update_status')
         render :template => 'projects/update_status.js.rjs'
         return
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 95b5e468..46377fa1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,6 +116,12 @@ module ApplicationHelper
       url_for({:controller => 'projects', :action => 'edit', :id => project.id}),
       {:id => "link_edit_#{dom_id(project)}", :class => "project_edit_settings"})
   end
+
+  def link_to_edit_context (context, descriptor = sanitize(context.name))
+    link_to(descriptor,
+      url_for({:controller => 'contexts', :action => 'edit', :id => context.id}),
+      {:id => "link_edit_#{dom_id(context)}", :class => "context_edit_settings"})
+  end
   
   def link_to_delete_project(project, descriptor = sanitize(project.name))
     link_to(
diff --git a/app/views/contexts/_context_form.rhtml b/app/views/contexts/_context_form.rhtml
index e22414f4..952e8a44 100644
--- a/app/views/contexts/_context_form.rhtml
+++ b/app/views/contexts/_context_form.rhtml
@@ -1,14 +1,22 @@
 <% context = context_form 
-   @context = context-%>
-<% form_remote_tag(:url => context_path(context), :html => {:id => dom_id(context, 'edit_form'), :class => "inline-form "+dom_id(context, 'edit_form')+"-edit-context-form edit-context-form", :method => :put}) do -%>
-            <%= error_messages_for 'context' %>
+@context = context
+-%>
+
+<% form_for(context, :html => {
+    :id => dom_id(context, 'edit_form'),
+    :class => "inline-form edit-project-form",
+    :method => :put }) do
+  -%>
+
+  <div id="edit_error_status"><%= error_messages_for("project") %></div>
+
 
   <label for="context_name">Context name</label><br/>
   <%= text_field('context', 'name', :class => 'context-name') %><br/>
 
-  <label for="context_hide">Hide from front page?</label>    
+  <label for="context_hide">Hide from front page?</label>
   <%= check_box('context', 'hide', :class => 'context-hide') %>
-  <input type="hidden" name="wants_render" value="true" /> 
+  <input type="hidden" name="wants_render" value="true" />
 
   <div class="submit_box">
     <div class="widgets">
@@ -24,5 +32,5 @@
   </div>
   <br/><br/>
 
-  <% end %>
+<% end %>
 
diff --git a/app/views/contexts/_context_listing.rhtml b/app/views/contexts/_context_listing.rhtml
index 79036bcd..cde76c9a 100644
--- a/app/views/contexts/_context_listing.rhtml
+++ b/app/views/contexts/_context_listing.rhtml
@@ -21,16 +21,20 @@ suppress_edit_button ||= false
       <% end %>
 
       <%= link_to_delete_context(context, image_tag( "blank.png", :title => t('contexts.delete_context'), :class=>"delete_item")) %>
+      <%= suppress_edit_button ? "" : link_to_edit_context(context, image_tag( "blank.png", :title => t('contexts.edit_context'), :class=>"edit_item")) %>
+
+      <% # = # link_to_remote(
+      #image_tag( "blank.png", :title => "Delete context", :class=>"delete_item"),
+      #:url => {:controller => 'contexts', :action => 'destroy', :id => context.id},
+      #:method => 'delete',
+      #:with => "'_source_view=#{@source_view}'",
+      #:before => "$('#{dom_id(context)}').block({message:null});",
+      #:complete => "$('#{dom_id(context)}').unblock();",
+      #:confirm => "Are you sure that you want to delete the context '#{context.name}'? Be aware that this will also delete all (repeating) actions in this context!",
+      #:html => { :id => dom_id(context, 'delete') }
+      #)
+      %>
 
-      <%=  link_to_remote(
-        image_tag( "blank.png", :title => t('contexts.edit_context'), :class=>"edit_item"),
-        :url => {:controller => 'contexts', :action => 'edit', :id => context.id},
-        :method => 'get',
-        :with => "'_source_view=#{@source_view}'",
-        :before => "$('#{dom_id(context)}').block({message:null});",
-        :complete => "$('#{dom_id(context)}').unblock();",
-        :html => {:id => "edit_context_#{context.id}_link"}
-      ) %>
     </div>
   </div>
   <div id="<%= dom_id(context, 'edit') %>" class="edit-form" style="display:none;">
diff --git a/app/views/contexts/edit.js.erb b/app/views/contexts/edit.js.erb
new file mode 100644
index 00000000..5211f447
--- /dev/null
+++ b/app/views/contexts/edit.js.erb
@@ -0,0 +1,21 @@
+replace_context_with_edit_form();
+
+function replace_context_with_edit_form() {
+  $('div#<%=dom_id(@context)%>').fadeOut(250, function() {
+    show_edit_form();
+    set_focus();
+  });
+}
+
+function show_edit_form() {
+  $('div#<%=dom_id(@context, 'edit')%>').html(html_for_edit_form());
+  $('div#<%=dom_id(@context, 'edit')%>').fadeIn(500);
+}
+
+function set_focus() {
+  $('input.context-name').focus();
+}
+
+function html_for_edit_form() {
+  return "<%= escape_javascript(render(:partial => 'context_form', :locals => { :context_form => @context })) %>"
+}
\ No newline at end of file
diff --git a/app/views/contexts/edit.js.rjs b/app/views/contexts/edit.js.rjs
deleted file mode 100644
index d9846e6c..00000000
--- a/app/views/contexts/edit.js.rjs
+++ /dev/null
@@ -1,4 +0,0 @@
-page[dom_id(@context, 'edit')].replace_html :partial => 'context_form', :locals => { :context_form => @context }
-page[@context].hide
-page[dom_id(@context, 'edit')].show
-page[dom_id(@context, 'edit_form')].find('input.context-name').focus
diff --git a/app/views/contexts/update.js.erb b/app/views/contexts/update.js.erb
new file mode 100644
index 00000000..9d3b2776
--- /dev/null
+++ b/app/views/contexts/update.js.erb
@@ -0,0 +1,47 @@
+<% if @saved -%>
+
+  page_notify('notice', '<%= t('contexts.save_status_message') %>', 5);
+
+  <% if @state_changed -%>
+    remove_and_re_add_context();
+  <% else -%>
+    replace_context_form_with_updated_context();
+  <% end -%>
+
+<% else -%>
+  show_errors();
+<% end -%>
+
+function remove_and_re_add_context() {
+  $('#<%=dom_id(@context, 'container')%>').slideUp(500, function() {
+    $('#<%=dom_id(@context, 'container')%>').remove();
+    $('#list-contexts-<%=@new_state%>').append(html_for_context_listing());
+  });
+}
+
+function replace_context_form_with_updated_context() {
+  $('#<%=dom_id(@context, 'container')%>').fadeOut(250, function() {
+<%
+    # first add the updated context after the old one, then remove old one
+    # using html() does not work, because it will replace the _content_ of
+    # the container instead of the container itself, i.e. you will get
+    # a container within a container which will break drag-and-drop sorting
+-%>
+    $('#<%=dom_id(@context, 'container')%>').after(html_for_context_listing());
+    $('#<%=dom_id(@context, 'container')%>').remove();
+    $('#<%=dom_id(@context, 'container')%>').fadeIn(500);
+  });
+}
+
+function show_errors() {
+  $('div#edit_error_status').html(html_for_error_messages());
+  $('div#edit_error_status').show();
+}
+
+function html_for_error_messages() {
+  return "<%= escape_javascript(error_messages_for('context')) %>";
+}
+
+function html_for_context_listing() {
+  return "<%= escape_javascript(render(:partial => 'context_listing', :object => @context))%>";
+}
\ No newline at end of file
diff --git a/app/views/contexts/update.js.rjs b/app/views/contexts/update.js.rjs
deleted file mode 100644
index ad999bc5..00000000
--- a/app/views/contexts/update.js.rjs
+++ /dev/null
@@ -1,9 +0,0 @@
-status_message = t('contexts.save_status_message')
-page.notify :notice, status_message, 5.0
-if @context_state_changed
-  page.remove dom_id(@context, 'container')
-  page.insert_html :bottom, "list-contexts-#{@new_state}", :partial => 'context_listing', :object => @context
-else
-  page.replace_html dom_id(@context, 'container'), :partial => 'context_listing', :object => @context
-end
-page.visual_effect :highlight, dom_id(@context), :duration => 3
diff --git a/app/views/projects/_project_form.rhtml b/app/views/projects/_project_form.rhtml
index 7b409023..bbcb461e 100644
--- a/app/views/projects/_project_form.rhtml
+++ b/app/views/projects/_project_form.rhtml
@@ -7,7 +7,7 @@ project = project_form
     :class => "inline-form edit-project-form",
     :method => :put }) do
   -%>
-  <div id="error_status"><%= error_messages_for("project") %></div>
+  <div id="edit_error_status"><%= error_messages_for("project") %></div>
   <%= source_view_tag( @source_view ) -%>
 
   <label for="project_name">Name:</label><br/>
diff --git a/app/views/projects/edit.js.erb b/app/views/projects/edit.js.erb
index 61f1886e..e9671ce1 100644
--- a/app/views/projects/edit.js.erb
+++ b/app/views/projects/edit.js.erb
@@ -1,9 +1,21 @@
-newHtml = "<%= escape_javascript(render(:partial => 'project_form', :locals => { :project_form => @project })) %>"
+replace_project_with_edit_form();
 
-$('div#<%=dom_id(@project)%>').fadeOut(250, function() {
-  $('div#<%=dom_id(@project, 'edit')%>').html(newHtml);
+function replace_project_with_edit_form() {
+  $('div#<%=dom_id(@project)%>').fadeOut(250, function() {
+    show_edit_form();
+    set_focus();
+  });
+}
+
+function show_edit_form() {
+  $('div#<%=dom_id(@project, 'edit')%>').html(html_for_edit_form());
   $('div#<%=dom_id(@project, 'edit')%>').fadeIn(500);
+}
+
+function set_focus() {
   $('input.project-name').focus();
-});
-
+}
 
+function html_for_edit_form() {
+  return "<%= escape_javascript(render(:partial => 'project_form', :locals => { :project_form => @project })) %>"
+}
\ No newline at end of file
diff --git a/app/views/projects/update.js.erb b/app/views/projects/update.js.erb
index f0dc6407..73f2072d 100644
--- a/app/views/projects/update.js.erb
+++ b/app/views/projects/update.js.erb
@@ -39,8 +39,8 @@
 enable_rich_interaction();
 
 function show_errors() {
-  $('div#error_status').html(html_for_error_messages());
-  $('div#error_status').show();
+  $('div#edit_error_status').html(html_for_error_messages());
+  $('div#edit_error_status').show();
 }
 
 function remove_project_edit_form() {
@@ -73,7 +73,7 @@ function replace_project_form_with_updated_project() {
 function remove_and_re_add_project() {
   $('#<%=dom_id(@project, 'container')%>').slideUp(500, function() {
     $('#<%=dom_id(@project, 'container')%>').remove();
-    $('#list-<%=@project.state%>-projects').append(html_for_project_listing);
+    $('#list-<%=@project.state%>-projects').append(html_for_project_listing());
     });
 }
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fdfbc319..c6f845ca 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -629,7 +629,8 @@ $(document).ready(function() {
           async: true,
           buttons_dom_elem: $(this),
           beforeSend: function() {
-              this.buttons_dom_elem.block({message: null});}
+              this.buttons_dom_elem.block({message: null});},
+          complete: function() {this.buttons_dom_elem.unblock();}
       });
       return false;
   });
@@ -654,6 +655,31 @@ $(document).ready(function() {
       }
   });
 
+  /* set behavior for edit context settings link in projects list page and project page
+   * TODO: refactor this and the edit for project because the function looks the same */
+  $("a.context_edit_settings").live('click', function (ev) {
+     $.ajax({
+         url: this.href,
+         async: true,
+         context_dom_elem: $(this).parent().parent(),
+         dataType: 'script',
+         beforeSend: function() {this.context_dom_elem.block({message: null});},
+         complete:function() {this.context_dom_elem.unblock(); enable_rich_interaction();}
+         });
+     return false;
+  });
+
+  $("form.edit-context-form button.positive").live('click', function (ev) {
+      $('form.edit-context-form').ajaxSubmit({
+          type: 'POST',
+          async: true,
+          buttons_dom_elem: $(this),
+          beforeSend: function() {
+              this.buttons_dom_elem.block({message: null});},
+          complete: function() {this.buttons_dom_elem.unblock();}
+      });
+      return false;
+  });
 
    $("form#context-form button.positive").live('click', function (ev) {
       $('form.#context-form').ajaxSubmit({