From 0ee03afe1da70c3622e13f5435d0385122c29c4e Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 11:39:33 -0700 Subject: [PATCH 01/10] DG IZ selector box on request page --- app/controllers/requests_controller.rb | 5 ----- app/views/requests/_request.html.haml | 14 +++++++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 4caff37f4..5865aacaf 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -43,9 +43,4 @@ class RequestsController < ApplicationController end end - - - private - - end diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index 03ab427f3..b44a27adb 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -3,6 +3,14 @@ %span.from = link_to "#{request.person.real_name}", '#' - %ul.request_buttons - %li= link_to 'Accept', request_path(request, :accept => true), :method => :delete - %li= link_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete + .request_buttons + = form_for request do |r| + = r.hidden_field(:accept, :accept, true) + %select{ :id => "request_group_id", :name => "request[group_id]"} + - for group in current_user.groups + %option{:value => group.id}= group.name + = r.submit_tag "Accept" + + = form_for request do |r| + = r.hidden_field(:accept, :accept, false) + = r.submit_tag "Ignore" From 2bc9d0156dddfb7088467bde97b44b6351a75b5b Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 11:59:13 -0700 Subject: [PATCH 05/10] 2 arguments in the hidden field --- app/views/requests/_request.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index b44a27adb..f5b280a5a 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -5,12 +5,12 @@ .request_buttons = form_for request do |r| - = r.hidden_field(:accept, :accept, true) + = r.hidden_field(:accept, true) %select{ :id => "request_group_id", :name => "request[group_id]"} - for group in current_user.groups %option{:value => group.id}= group.name = r.submit_tag "Accept" = form_for request do |r| - = r.hidden_field(:accept, :accept, false) + = r.hidden_field(:accept,false) = r.submit_tag "Ignore" From b1c29083df936787233cda5359aafd7fb13dc467 Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 14:34:16 -0700 Subject: [PATCH 06/10] changed the link data-method --- app/views/requests/_request.html.haml | 25 +++++++++++++++---------- app/views/requests/index.html.haml | 1 - 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index f5b280a5a..ebc21cbe0 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -1,16 +1,21 @@ +:javascript + $(document).ready(function(){ + $(".group_selector").change( function() { + var id = $(this).children(":selected").val(); + $(this).parent().children(".accept").html( "Accept"); + }); + }); + + %li.message{:id => request.id} %span.from = link_to "#{request.person.real_name}", '#' - .request_buttons - = form_for request do |r| - = r.hidden_field(:accept, true) - %select{ :id => "request_group_id", :name => "request[group_id]"} - - for group in current_user.groups - %option{:value => group.id}= group.name - = r.submit_tag "Accept" + %ul.request_buttons + %select{ :class => "group_selector" } + - for group in current_user.groups + %option{:value => group.id}= group.name + %li.accept= button_to 'Accept', request_path(request, :accept => true), :method => :delete + %li.ignore= button_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete - = form_for request do |r| - = r.hidden_field(:accept,false) - = r.submit_tag "Ignore" diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index cc33576cd..81b84f6ab 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -6,7 +6,6 @@ = render "form", :request => @request %h3= "currently #{@request_count} requests" - %ul#stream - for request in @remote_requests = render "request", :request => request From 97e5468cea672b3cd125d51de45b3c9c40c8b4a7 Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 14:46:15 -0700 Subject: [PATCH 07/10] adding the user to the correct group --- app/controllers/requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 4945436c3..756087d31 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -8,7 +8,7 @@ class RequestsController < ApplicationController def destroy if params[:accept] - @friend = current_user.accept_and_respond( params[:id], current_user.groups.first.id) + @friend = current_user.accept_and_respond( params[:id], current_user.group_by_id(params[:group_id])) flash[:notice] = "you are now friends" redirect_to root_url From 373321beefdb3fcc60f7f8bd366eb0b17425450a Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 14:52:59 -0700 Subject: [PATCH 08/10] DG IZ made the selector box going to the right thing by passing only the id --- app/controllers/requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 756087d31..fd6cfc74f 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -8,7 +8,7 @@ class RequestsController < ApplicationController def destroy if params[:accept] - @friend = current_user.accept_and_respond( params[:id], current_user.group_by_id(params[:group_id])) + @friend = current_user.accept_and_respond( params[:id], params[:group_id]) flash[:notice] = "you are now friends" redirect_to root_url From 92aa72447fa62da792bf403c234a1f726d0dca52 Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 14:57:22 -0700 Subject: [PATCH 09/10] DG IZ fixed the css in selector --- app/views/requests/_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index ebc21cbe0..6c8bb7307 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -13,7 +13,7 @@ = link_to "#{request.person.real_name}", '#' %ul.request_buttons - %select{ :class => "group_selector" } + %select{ :class => "group_selector", :style=>"display:inline;"} - for group in current_user.groups %option{:value => group.id}= group.name %li.accept= button_to 'Accept', request_path(request, :accept => true), :method => :delete From 4a36df29e518c53486e871e67c04cf162662cf65 Mon Sep 17 00:00:00 2001 From: ilya Date: Mon, 16 Aug 2010 14:59:23 -0700 Subject: [PATCH 10/10] DG IZ now the links are of button style --- app/views/requests/_request.html.haml | 6 +++--- app/views/requests/index.html.haml | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index 6c8bb7307..e29b45bc5 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -2,7 +2,7 @@ $(document).ready(function(){ $(".group_selector").change( function() { var id = $(this).children(":selected").val(); - $(this).parent().children(".accept").html( "Accept"); + $(this).parent().children(".accept").html( "Accept"); }); }); @@ -16,6 +16,6 @@ %select{ :class => "group_selector", :style=>"display:inline;"} - for group in current_user.groups %option{:value => group.id}= group.name - %li.accept= button_to 'Accept', request_path(request, :accept => true), :method => :delete - %li.ignore= button_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete + %li.accept= link_to 'Accept', request_path(request, :accept => true), :method => :delete, :class => "button" + %li.ignore= link_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete, :class => "button" diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index 81b84f6ab..6ba3067c5 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -3,8 +3,6 @@ = link_to "⇧ home", root_path Requests -= render "form", :request => @request - %h3= "currently #{@request_count} requests" %ul#stream - for request in @remote_requests