Diff
Modified: branches/rails2/app/controllers/memberships_controller.rb (2781 => 2782)
--- branches/rails2/app/controllers/memberships_controller.rb 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/controllers/memberships_controller.rb 2011-11-02 11:49:00 UTC (rev 2782)
@@ -205,7 +205,7 @@
respond_to do |format|
if @membership.update_attributes(params[:membership])
flash[:notice] = 'Membership was successfully updated.'
- format.html { redirect_to membership_url(@membership.user_id, @membership) }
+ format.html { redirect_to user_membership_url(@membership.user_id, @membership) }
else
format.html { render :action ="" "edit" }
end
@@ -435,7 +435,7 @@
(err = Membership.new.errors).add(attr, message)
respond_to do |format|
- format.html { redirect_to memberships_url(current_user.id) }
+ format.html { redirect_to user_memberships_url(current_user.id) }
end
end
Modified: branches/rails2/app/views/gadgets/_user_monitor.rhtml (2781 => 2782)
--- branches/rails2/app/views/gadgets/_user_monitor.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/gadgets/_user_monitor.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -78,8 +78,8 @@
<ul class="gadget_list">
<% membership_invites.each do |membership| %>
<li>
- <%= icon "membership", membership_path(membership.user, membership), nil, nil, "" -%>
- <b><%= link_to truncate("From #{h(membership.network.owner.name)}", :length => trunc_length), membership_path(membership.user, membership), :title => tooltip_title_attrib("From #{h(membership.network.owner.name)}") -%></b>
+ <%= icon "membership", user_membership_path(membership.user, membership), nil, nil, "" -%>
+ <b><%= link_to truncate("From #{h(membership.network.owner.name)}", :length => trunc_length), user_membership_path(membership.user, membership), :title => tooltip_title_attrib("From #{h(membership.network.owner.name)}") -%></b>
<span style="margin-left: 20px; display: block;"><small>(for Group: <%= title membership.network_id %>)</small></span>
</li>
<% end %>
@@ -99,8 +99,8 @@
<ul class="gadget_list">
<% membership_requests.each do |membership| %>
<li>
- <%= icon "membership", membership_path(membership.user, membership), nil, nil, "" -%>
- <b><%= link_to truncate("From #{h(membership.user.name)}", :length => trunc_length), membership_path(membership.user, membership), :title => tooltip_title_attrib("From #{h(membership.user.name)}") -%></b>
+ <%= icon "membership", user_membership_path(membership.user, membership), nil, nil, "" -%>
+ <b><%= link_to truncate("From #{h(membership.user.name)}", :length => trunc_length), user_membership_path(membership.user, membership), :title => tooltip_title_attrib("From #{h(membership.user.name)}") -%></b>
<span style="margin-left: 20px; display: block;"><small>(for Group: <%= title membership.network_id %>)</small></span>
</li>
<% end %>
Modified: branches/rails2/app/views/memberships/_table.rhtml (2781 => 2782)
--- branches/rails2/app/views/memberships/_table.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/memberships/_table.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -26,22 +26,22 @@
<td><%= "<b>" unless membership.accepted? %><%=datetime(membership.accepted_at, false) || "Pending" %><%= "</b>" unless membership.accepted? %></td>
<td class="actions">
<% if my_page? membership.user.id or (logged_in? and membership.network.administrator?(current_user.id)) %>
- <%= icon "show", membership_path(membership.user_id, membership), nil, nil, "View" %>
+ <%= icon "show", user_membership_path(membership.user_id, membership), nil, nil, "View" %>
<% if membership.accepted? %>
- <%= icon "destroy", membership_path(membership.user_id, membership), nil, { :confirm => "Are you sure?", :method => :delete }, "Remove" %>
+ <%= icon "destroy", user_membership_path(membership.user_id, membership), nil, { :confirm => "Are you sure?", :method => :delete }, "Remove" %>
<% end %>
<% end %>
<% if allow_approval %>
<% unless membership.accepted? %>
- <%= icon "confirm", accept_membership_path(current_user.id, membership), nil, :method => :post %>
- <%= icon "reject", membership_path(membership.user_id, membership), nil, :confirm => "Are you sure?", :method => :delete %>
+ <%= icon "confirm", accept_user_membership_path(current_user.id, membership), nil, :method => :post %>
+ <%= icon "reject", user_membership_path(membership.user_id, membership), nil, :confirm => "Are you sure?", :method => :delete %>
<% end %>
<% end %>
<% if membership.accepted? %>
<% if membership.network.administrator?(membership.user_id) %>
- <%= icon "remove_group_admin", membership_path(membership.user_id, membership)+'?membership[administrator]=0', nil, {:method => :put}, "Remove group admin status" %>
+ <%= icon "remove_group_admin", user_membership_path(membership.user_id, membership)+'?membership[administrator]=0', nil, {:method => :put}, "Remove group admin status" %>
<% else %>
- <%= icon "make_group_admin", membership_path(membership.user_id, membership)+'?membership[administrator]=1', nil, {:method => :put}, "Add
+ <%= icon "make_group_admin", user_membership_path(membership.user_id, membership)+'?membership[administrator]=1', nil, {:method => :put}, "Add
group admin status" %>
<% end %>
<% end %>
Modified: branches/rails2/app/views/memberships/edit.rhtml (2781 => 2782)
--- branches/rails2/app/views/memberships/edit.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/memberships/edit.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -2,8 +2,8 @@
<%= error_messages_for :membership %>
-<% form_for(:membership, :url ="" membership_path(@membership.user_id, @membership), :html => { :method => :put }) do |f| %>
+<% form_for(:membership, :url ="" user_membership_path(@membership.user_id, @membership), :html => { :method => :put }) do |f| %>
<p>
<%= submit_tag "Save Changes" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: branches/rails2/app/views/memberships/show.rhtml (2781 => 2782)
--- branches/rails2/app/views/memberships/show.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/memberships/show.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -101,7 +101,7 @@
<!-- These forms serve as 'data senders' for Accept/Reject buttons -->
- <% form_tag(accept_membership_path(current_user.id, @membership)) do %>
+ <% form_tag(accept_user_membership_path(current_user.id, @membership)) do %>
<%= hidden_field_tag "accept_msg", "" %>
<% end %>
Modified: branches/rails2/app/views/networks/_table.rhtml (2781 => 2782)
--- branches/rails2/app/views/networks/_table.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/networks/_table.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -74,7 +74,7 @@
<!-- user is not an admin, but a member already -->
<% cur_membership = Membership.find(:first, :conditions => ["network_id = ? AND user_id = ?", network.id, current_user.id] ) %>
<% if cur_membership %>
- <%= icon('network-leave', membership_path(cur_membership.user_id, cur_membership) + "?return_to=" + groups_path, nil, { :confirm => "Are you sure want to leave this group?", :method => :delete }, 'Leave Group') %>
+ <%= icon('network-leave', user_membership_path(cur_membership.user_id, cur_membership) + "?return_to=" + groups_path, nil, { :confirm => "Are you sure want to leave this group?", :method => :delete }, 'Leave Group') %>
<% end %>
<% elsif !current_user.membership_pending?(network.id) %>
<!-- not an admin, not a member yet and hasn't got pending request -->
Modified: branches/rails2/app/views/networks/show.rhtml (2781 => 2782)
--- branches/rails2/app/views/networks/show.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/networks/show.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -7,7 +7,7 @@
</div>
<% elsif current_user.membership_invite_pending?(@network.id) %>
<div class="box_standout">
- <span style="text-align: left;"><b>You have been invited to join this group. Awaiting your <%= link_to "confirmation", membership_path(current_user, Membership.find(:first, :conditions => ['network_id = ? AND user_id = ?', @network, current_user])) -%>.</b></span>
+ <span style="text-align: left;"><b>You have been invited to join this group. Awaiting your <%= link_to "confirmation", user_membership_path(current_user, Membership.find(:first, :conditions => ['network_id = ? AND user_id = ?', @network, current_user])) -%>.</b></span>
</div>
<% end %>
<% end %>
@@ -18,7 +18,7 @@
<% if @network.member? current_user.id %>
<% cur_membership = Membership.find(:first, :conditions => ["network_id = ? AND user_id = ?", @network.id, current_user.id] ) %>
<% if cur_membership %>
- <li><%= icon('network-leave', membership_path(cur_membership.user_id, cur_membership), nil, { :confirm => "Are you sure want to leave this group?", :method => :delete }, 'Leave Group') %></li>
+ <li><%= icon('network-leave', user_membership_path(cur_membership.user_id, cur_membership), nil, { :confirm => "Are you sure want to leave this group?", :method => :delete }, 'Leave Group') %></li>
<% end %>
<% elsif !current_user.membership_pending?(@network.id) %>
<li class="with_sep_bottom"><%= request_membership_link(current_user.id, @network.id) %></li>
Modified: branches/rails2/app/views/notifier/membership_invite.rhtml (2781 => 2782)
--- branches/rails2/app/views/notifier/membership_invite.rhtml 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/app/views/notifier/membership_invite.rhtml 2011-11-02 11:49:00 UTC (rev 2782)
@@ -5,7 +5,7 @@
Name: <%= @network.title %>
Administrator: <%= @network.owner.name %>
-Please go to <%= "http://" + @base_url + membership_path(@user, @membership) %> to confirm/reject this invite.
+Please go to <%= "http://" + @base_url + user_membership_path(@user, @membership) %> to confirm/reject this invite.
<%= login_identity_reminder(@target) %>
Modified: branches/rails2/config/routes.rb (2781 => 2782)
--- branches/rails2/config/routes.rb 2011-11-01 15:09:52 UTC (rev 2781)
+++ branches/rails2/config/routes.rb 2011-11-02 11:49:00 UTC (rev 2782)
@@ -189,9 +189,6 @@
# messages
map.resources :messages, :collection => { :sent => :get, :delete_all_selected => :delete }
- # all ***ship's
- map.resources :memberships
-
# all oauth
map.oauth '/oauth',:controller=>'oauth',:action=""
map.authorize '/oauth/authorize',:controller=>'oauth',:action=""