From eded5a10ebb24decfc4da5dc3e12098c899c517f Mon Sep 17 00:00:00 2001
From: svmk <svmk-tmsk@yandex.ru>
Date: Thu, 21 Apr 2011 15:03:37 +0700
Subject: [PATCH] Some bug-fixes: changed send method from get to post in routes.

---
 app/views/conversations/new_contact.haml |    4 ++--
 config/application.rb                    |    2 +-
 config/routes.rb                         |   14 +++++++-------
 public/stylesheets/sass/application.sass |    3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/views/conversations/new_contact.haml b/app/views/conversations/new_contact.haml
index f792eb1..e35232c 100644
--- a/app/views/conversations/new_contact.haml
+++ b/app/views/conversations/new_contact.haml
@@ -21,7 +21,7 @@
   });
   function change_contact(people_id,url_path,people_url,it,class_name)
     {
-        g = $.ajax({url:url_path,async:false,cache:false});
+        g = $.ajax({url:url_path,async:false,cache:false,type:'POST'});
         if (g.status == 200)
         {
             if (g.responseText.indexOf('O') != -1)
@@ -120,7 +120,7 @@
         };
     }
 .contact_list_new
-  = search_field_tag :contact_search, "", :class => 'contact_list_search', :results => 5, :placeholder => t('shared.contact_list.all_contacts')
+  = search_field_tag :contact_search, "", :class => 'contact_list_search new_contact', :results => 5, :placeholder => t('shared.contact_list.all_contacts')
   %ul
     - active_records = @active_contacts.map{|rec| rec.person.id}
     - for contact in @active_contacts
diff --git a/config/application.rb b/config/application.rb
index 16c16a1..607be96 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -47,7 +47,7 @@ module Diaspora
     config.encoding = "utf-8"

     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
+#    config.filter_parameters += [:password]
     config.filter_parameters += [:xml]
     config.filter_parameters += [:message]
     config.filter_parameters += [:text]
diff --git a/config/routes.rb b/config/routes.rb
index 84d2b5e..99413c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,13 +25,13 @@ Diaspora::Application.routes.draw do
   resources :contacts
   resources :aspect_memberships, :only => [:destroy, :create]

-  match 'conversations/:conversation_id/afford_to_own/:person_id', :to => 'conversations#afford_to_own'
-  match 'conversations/:conversation_id/prohibit_owning/:person_id', :to => 'conversations#prohibit_owning'
-  match 'conversations/:conversation_id/allow_edit/:person_id', :to => 'conversations#allow_edit'
-  match 'conversations/:conversation_id/prohibit_edit/:person_id', :to => 'conversations#prohibit_edit'
-  match 'conversations/:conversation_id/delete_contact/:person_id', :to => 'conversations#delete_contact'
-  match 'conversations/:conversation_id/create_contact/:person_id', :to => 'conversations#create_contact'
-  match 'conversations/:conversation_id/new_contact', :to => 'conversations#new_contact'
+  match 'conversations/:conversation_id/afford_to_own/:person_id', :to => 'conversations#afford_to_own', :via => [:post]
+  match 'conversations/:conversation_id/prohibit_owning/:person_id', :to => 'conversations#prohibit_owning', :via => [:post]
+  match 'conversations/:conversation_id/allow_edit/:person_id', :to => 'conversations#allow_edit', :via => [:post]
+  match 'conversations/:conversation_id/prohibit_edit/:person_id', :to => 'conversations#prohibit_edit', :via => [:post]
+  match 'conversations/:conversation_id/delete_contact/:person_id', :to => 'conversations#delete_contact', :via => [:post]
+  match 'conversations/:conversation_id/create_contact/:person_id', :to => 'conversations#create_contact', :via => [:post]
+  match 'conversations/:conversation_id/new_contact', :to => 'conversations#new_contact', :via => [:get]
   resources :conversations do
     resources :messages, :only => [:create, :show]
     resource :conversation_visibility, :only => [:destroy], :path => '/visibility/'
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b3b2b50..e082eba 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1852,10 +1852,9 @@ ul#request_result
   :border-radius 0 0 5px 5px

   input.contact_list_search
-    :width 97.5%
+    :width 326px
     :margin
       :top 0
-
   ul
     :margin-top 1px
     :margin-left 0px
--
1.7.1