From 48f7f25702f2b743dbdb5a9691c143ef009cb1d4 Mon Sep 17 00:00:00 2001
From: Eric Allen <ericpallen@gmail.com>
Date: Fri, 2 Oct 2009 15:25:20 -0400
Subject: [PATCH] Fix Edit Project Settings link on project show page

---
 app/views/projects/_project_settings.rhtml | 6 +++---
 public/javascripts/application.js          | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/_project_settings.rhtml b/app/views/projects/_project_settings.rhtml
index 6b1e5b10..9b722178 100644
--- a/app/views/projects/_project_settings.rhtml
+++ b/app/views/projects/_project_settings.rhtml
@@ -19,8 +19,8 @@
       :url => {:controller => 'projects', :action => 'edit', :id => project.id},
       :method => 'get',
       :with => "'_source_view=#{@source_view}'",
-      :before => "$('#{dom_id(project)}').startWaiting();",
-      :complete => "$('#{dom_id(project)}').stopWaiting();"
+      :before => "$('#{dom_id(project)}').block({message: null});",
+      :complete => "$('#{dom_id(project)}').unblock();"
     ) %>
   </div>
   <% unless project.description.blank? -%>
@@ -28,4 +28,4 @@
   <% end -%>
 </div>
 <div id="<%= dom_id(project, 'edit') %>" class="edit-form" style="display:none;">
-</div>
\ No newline at end of file
+</div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e801eac0..9f1d94a3 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -271,8 +271,9 @@ $(document).ready(function() {
       'Add a next action »', 'Add a next action');
     });
 
-  $('.item-container .edit-form a.negative').live('click', function(){
+  $('.edit-form a.negative').live('click', function(){
       $(this).parents('.container').find('.item-show').show();
+      $(this).parents('.container').find('.project').show();
       $(this).parents('.edit-form').hide();
       });
   
@@ -388,6 +389,7 @@ $(document).ready(function() {
   $("#list-active-projects").sortable({handle: '.handle', update: update_project_order});
   $("#list-hidden-projects").sortable({handle: '.handle', update: update_project_order});
   $("#list-completed-projects").sortable({handle: '.handle', update: update_project_order});
-  
+
+  /* Gets called from some AJAX callbacks, too */
   enable_rich_interaction();
 });