small fixes, still using old sharing code

app/controllers/member/sharings_controller.rb

@@ -15,7 +15,7 @@ def index
   end
 
   def new
-    @sharing = GroupSharing.new(:shareable_type => params[:shareable_type], :shareable_id => params[:shareable_id])
+    @sharing = Share.new(:shareable_type => params[:shareable_type], :shareable_id => params[:shareable_id])
     @shareable = @sharing.shareable
     @groups = current_user.groups
     @referer = request.referer
@@ -62,4 +62,4 @@ def find_group
       @group = Group.find(params[:group_id]) if params[:group_id]      
     end
 
-end
+end

app/helpers/sharings_helper.rb

@@ -17,17 +17,27 @@ def share_link(link_text, share_with, shareable)
           :html => {:title => I18n.t("tog_social.sharings.member.share_with", :name => share_with.name)}
     end
   end    
+
+  def shared_to_title(sharing)
+    title_for_object(sharing.shared_to)
+  end
+
+  def shareable_title(sharing)
+    title_for_object(sharing.shareable)
+  end  
 
-  def shareable_title(shareable)
-    if (shareable.respond_to?(:name))
-      string = shareable.name
-    elsif (shareable.respond_to?(:title))
-      string = shareable.title
-    else
-      string = shareable.to_s
+  private 
+
+    def title_for_object(obj)
+      if (obj.respond_to?(:name))
+        string = obj.name
+      elsif (obj.respond_to?(:title))
+        string = obj.title
+      else
+        string = obj.to_s
+      end
+      string      
     end
-    string
-  end  
 
 end
 

app/views/member/sharings/index.html.erb

@@ -23,11 +23,11 @@
     <% for sharing in @sharings %>
     <tr<%= cycle(' class="pair"', '') -%>>
       <td><%= shareable_title(sharing) %></td>
-      <td><%= link_to sharing.group.name, group_path(sharing.group) %></td>
-      <td><%= sharing.creation_date %></td>
+      <td><%= link_to shared_to_title(sharing), sharing.shared_to %></td>
+      <td><%= I18n.l(sharing.created_at, :format => :short) %></td>
       <td><%= link_to I18n.t('tog_social.sharings.member.remove_share'), 
-              member_destroy_sharing_path(sharing.group, sharing), 
-              :method => :delete, :confirm => I18n.t('tog_social.sharings.member.remove_confirmation', :object => shareable_title(sharing), :group => sharing.group.name) %></td>
+              member_destroy_sharing_path(sharing.shared_to, sharing), 
+              :method => :delete, :confirm => I18n.t('tog_social.sharings.member.remove_confirmation', :object => shareable_title(sharing), :group => shared_to_title(sharing)) %></td>
     </tr>
     <% end %>
   </tbody>