Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

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], params[:group_id])
       
       flash[:notice] = "you are now friends"
       redirect_to root_url 
@@ -43,9 +43,4 @@ class RequestsController < ApplicationController
     end
   end
 
-
-  
-  private 
-
-
 end

app/views/requests/_request.html.haml

@@ -1,8 +1,21 @@
+:javascript
+  $(document).ready(function(){
+    $(".group_selector").change( function() {
+      var id = $(this).children(":selected").val();
+      $(this).parent().children(".accept").html( "<a href=\"/requests/#{request.id}/?accept=true&group_id="+id+"\" data-method=\"delete\" rel=\"nofollow\" class=\"button\">Accept</a>");
+    });
+  });
+
+
 %li.message{:id => request.id}
 
   %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
+    %select{ :class => "group_selector", :style=>"display:inline;"}
+      - for group in current_user.groups
+        %option{:value => group.id}= group.name
+    %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"
+

app/views/requests/index.html.haml

@@ -3,10 +3,7 @@
     = link_to "⇧ home", root_path
   Requests
 
-= render "form", :request => @request
-
 %h3= "currently #{@request_count} requests"
-
 %ul#stream
   - for request in @remote_requests
     = render "request", :request => request