Diff
Modified: trunk/app/controllers/citations_controller.rb (2066 => 2067)
--- trunk/app/controllers/citations_controller.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/controllers/citations_controller.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -48,7 +48,7 @@
respond_to do |format|
if @citation.save
flash[:notice] = 'Citation was successfully created.'
- format.html { redirect_to citation_url(@workflow, @citation) }
+ format.html { redirect_to workflow_citation_url(@workflow, @citation) }
else
format.html { render :action ="" "new" }
end
@@ -73,7 +73,7 @@
respond_to do |format|
flash[:notice] = 'Citation was successfully deleted.'
- format.html { redirect_to citations_url(@workflow) }
+ format.html { redirect_to workflow_citations_url(@workflow) }
end
end
Modified: trunk/app/controllers/friendships_controller.rb (2066 => 2067)
--- trunk/app/controllers/friendships_controller.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/controllers/friendships_controller.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -111,7 +111,7 @@
end
flash[:notice] = 'Friendship was successfully requested.'
- format.html { redirect_to friendship_url(current_user.id, @friendship) }
+ format.html { redirect_to user_friendship_url(current_user.id, @friendship) }
else
format.html { render :action ="" "new" }
end
@@ -176,7 +176,7 @@
respond_to do |format|
flash[:notice] = "Friendship was successfully deleted"
- format.html { redirect_to (params[:return_to] ? params[:return_to] : friendships_url(friend_id)) }
+ format.html { redirect_to(params[:return_to] ? params[:return_to] : user_friendships_url(friend_id)) }
end
end
Modified: trunk/app/controllers/memberships_controller.rb (2066 => 2067)
--- trunk/app/controllers/memberships_controller.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/controllers/memberships_controller.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -133,7 +133,7 @@
flash[:notice] = 'Membership was successfully requested.'
end
- format.html { redirect_to membership_url(current_user.id, @membership) }
+ format.html { redirect_to user_membership_url(current_user.id, @membership) }
else
format.html { render :action ="" "new" }
end
@@ -219,7 +219,7 @@
respond_to do |format|
flash[:notice] = "Membership successfully deleted"
- format.html { redirect_to (params[:return_to] ? params[:return_to] : group_path(network_id)) }
+ format.html { redirect_to(params[:return_to] ? params[:return_to] : group_path(network_id)) }
end
end
@@ -230,7 +230,7 @@
def check_user_present
if params[:user_id].blank?
flash.now[:error] = "Invalid URL"
- redirect_to memberships_url(current_user.id)
+ redirect_to user_memberships_url(current_user.id)
return false
end
end
Modified: trunk/app/controllers/pictures_controller.rb (2066 => 2067)
--- trunk/app/controllers/pictures_controller.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/controllers/pictures_controller.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -118,7 +118,7 @@
@picture.destroy
respond_to do |format|
- format.html { redirect_to pictures_url(user_id) }
+ format.html { redirect_to user_pictures_url(user_id) }
end
end
Modified: trunk/app/controllers/reviews_controller.rb (2066 => 2067)
--- trunk/app/controllers/reviews_controller.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/controllers/reviews_controller.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -51,7 +51,7 @@
if @review.save
update_rating(@review, params[:rating])
flash[:notice] = 'Thank you for your review!'
- format.html { redirect_to review_url(@reviewable, @review) }
+ format.html { redirect_to workflow_review_url(@reviewable, @review) }
else
format.html { render :action ="" "new" }
end
@@ -69,7 +69,7 @@
if @review.update_attributes(params[:review])
update_rating(@review, params[:rating])
flash[:notice] = 'Review was successfully updated.'
- format.html { redirect_to review_url(@reviewable, @review) }
+ format.html { redirect_to workflow_review_url(@reviewable, @review) }
else
format.html { render :action ="" "edit" }
end
@@ -81,7 +81,7 @@
respond_to do |format|
flash[:notice] = 'Review was successfully deleted.'
- format.html { redirect_to reviews_url(@reviewable) }
+ format.html { redirect_to workflow_reviews_url(@reviewable) }
end
end
Modified: trunk/app/helpers/application_helper.rb (2066 => 2067)
--- trunk/app/helpers/application_helper.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/helpers/application_helper.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -212,7 +212,7 @@
text = "<b>" + text + " (#{length})</b>"
end
- mships = icon('membership', memberships_path(user), nil, nil, text)
+ mships = icon('membership', user_memberships_path(user), nil, nil, text)
return mships
Modified: trunk/app/views/blobs/new.rhtml (2066 => 2067)
--- trunk/app/views/blobs/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/blobs/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -7,7 +7,7 @@
<%= error_messages_for :blob %>
-<% form_tag ({:action ="" :create}, :multipart => true) do %>
+<% form_tag({:action ="" :create}, :multipart => true) do %>
<p style="text-align: center;">
<strong>File to upload: </strong>
Modified: trunk/app/views/citations/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/citations/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/citations/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -6,7 +6,7 @@
<li><b>»</b></li>
-<li><%= link_to 'Citations', citations_path(@workflow) -%></li>
+<li><%= link_to 'Citations', workflow_citations_path(@workflow) -%></li>
<% if ["show", "new", "edit"].include? controller.action_name.to_s -%>
<li><b>»</b></li>
@@ -16,7 +16,7 @@
<% when "new" %>
<li>New Citation</li>
<% when "edit" %>
- <li><%= link_to "#{h(@citation.title)}", citation_path(@workflow, @citation) %></li>
+ <li><%= link_to "#{h(@citation.title)}", workflow_citation_path(@workflow, @citation) %></li>
<li><b>»</b></li>
<li>Edit</li>
<% else %>
Modified: trunk/app/views/citations/edit.rhtml (2066 => 2067)
--- trunk/app/views/citations/edit.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/citations/edit.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,10 +2,10 @@
<%= error_messages_for :citation %>
-<% form_for(:citation, :url ="" citation_path(@workflow, @citation), :html => { :method => :put }) do |f| %>
+<% form_for(:citation, :url ="" workflow_citation_path(@workflow, @citation), :html => { :method => :put }) do |f| %>
<%= render :partial => "citations/form", :object => f %>
<p>
<%= submit_tag "Update", :disable_with => "Updating..." %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/citations/new.rhtml (2066 => 2067)
--- trunk/app/views/citations/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/citations/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,10 +2,10 @@
<%= error_messages_for :citation %>
-<% form_for(:citation, :url ="" citations_path(@workflow)) do |f| %>
+<% form_for(:citation, :url ="" workflow_citations_path(@workflow)) do |f| %>
<%= render :partial => "citations/form", :object => f %>
<p>
<%= submit_tag "Create", :disable_with => 'Creating...' %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/contributions/_contributor_form.rhtml (2066 => 2067)
--- trunk/app/views/contributions/_contributor_form.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/contributions/_contributor_form.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -11,13 +11,13 @@
<p>
<p>
- <%= f.radio_button(:class_id, "User-#{user.id}", { :checked => (current.type.to_s == "User" and current.id.to_i == user.id) }) %> - <%= link_to 'Me', user_path(user) %>
+ <%= f.radio_button(:class_id, "User-#{user.id}", { :checked => (current.class.to_s == "User" and current.id.to_i == user.id) }) %> - <%= link_to 'Me', user_path(user) %>
</p>
<% unless user.networks_owned.empty? %>
<p>
<b>Administrator of...</b><br/>
<% for n in user.networks_owned %>
- <%= f.radio_button(:class_id, "Network-#{n.id}", { :checked => (current.type.to_s == "Network" and current.id.to_i == n.id) }) %> - <%= link_to h(n.title), group_path(n) %><br/>
+ <%= f.radio_button(:class_id, "Network-#{n.id}", { :checked => (current.class.to_s == "Network" and current.id.to_i == n.id) }) %> - <%= link_to h(n.title), group_path(n) %><br/>
<% end %>
</p>
<% end %>
@@ -25,7 +25,7 @@
<p>
<b>Member of..</b><br/>
<% for n in user.networks %>
- <%= f.radio_button(:class_id, "Network-#{n.id}", { :checked => (current.type.to_s == "Network" and current.id.to_i == n.id) }) %> - <%= link_to h(n.title), group_path(n) %><br/>
+ <%= f.radio_button(:class_id, "Network-#{n.id}", { :checked => (current.class.to_s == "Network" and current.id.to_i == n.id) }) %> - <%= link_to h(n.title), group_path(n) %><br/>
<% end %>
</p>
<% end %>
Modified: trunk/app/views/downloads/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/downloads/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/downloads/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -6,7 +6,7 @@
<li><b>»</b></li>
-<li><%= link_to 'Downloads', downloads_path(@contribution) %>
+<li><%= link_to 'Downloads', contribution_downloads_path(@contribution) %>
<% if ["show"].include? controller.action_name.to_s %>
<li><b>»</b></li>
Modified: trunk/app/views/friendships/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/friendships/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/friendships/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -7,7 +7,7 @@
<li><b>»</b></li>
- <li><%= link_to 'Friendships', friendships_path(@user) %></li>
+ <li><%= link_to 'Friendships', user_friendships_path(@user) %></li>
<% else %>
<li><%= link_to 'Friendships', url_for(:controller => :friendships) %>
<% end %>
@@ -15,5 +15,5 @@
<% if ["show"].include? controller.action_name.to_s %>
<li><b>»</b></li>
- <li><%= link_to "View: #{h(@friendship.user.name)}", friendship_path(@friendship.friend, @friendship) %></li>
+ <li><%= link_to "View: #{h(@friendship.user.name)}", user_friendship_path(@friendship.friend, @friendship) %></li>
<% end %>
Modified: trunk/app/views/friendships/_table.rhtml (2066 => 2067)
--- trunk/app/views/friendships/_table.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/friendships/_table.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -21,13 +21,13 @@
<td><%= "<b>" unless friendship.accepted? %><%=datetime(friendship.accepted_at, false) || "Pending" %><%= "</b>" unless friendship.accepted? %></td>
<td class="actions">
<% if mine? friendship %>
- <%= icon "show", friendship_path(friendship.friend_id, friendship), nil, nil, "View" %>
+ <%= icon "show", user_friendship_path(friendship.friend_id, friendship), nil, nil, "View" %>
<% unless friendship.accepted? %> <%= icon "confirm", accept_friendship_path(friendship.friend_id, friendship), nil, :method => :post %><% end %>
- <%= icon (friendship.accepted? ? "destroy" : "reject"), friendship_path(friendship.friend_id, friendship), nil, :confirm => "Are you sure?", :method => :delete %>
+ <%= icon (friendship.accepted? ? "destroy" : "reject"), user_friendship_path(friendship.friend_id, friendship), nil, :confirm => "Are you sure?", :method => :delete %>
<% end %>
</td>
</tr>
<% end %>
</table>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/friendships/edit.rhtml (2066 => 2067)
--- trunk/app/views/friendships/edit.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/friendships/edit.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,8 +2,8 @@
<%= error_messages_for :friendship %>
-<% form_for(:friendship, :url ="" friendship_path(@friendship.friend_id, @friendship), :html => { :method => :put }) do |f| %>
+<% form_for(:friendship, :url ="" user_friendship_path(@friendship.friend_id, @friendship), :html => { :method => :put }) do |f| %>
<p>
<%= submit_tag "Save Changes" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/friendships/new.rhtml (2066 => 2067)
--- trunk/app/views/friendships/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/friendships/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :friendship %>
-<% form_for(:friendship, :url ="" friendships_path) do |f| %>
+<% form_for(:friendship, :url ="" user_friendships_path) do |f| %>
<%= f.hidden_field :user_id, :value => current_user.id %>
<%= f.hidden_field :friend_id, :value => params[:user_id] %>
<% friend = User.find(params[:user_id]) %>
@@ -59,4 +59,4 @@
</div>
<% end %>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/friendships/show.rhtml (2066 => 2067)
--- trunk/app/views/friendships/show.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/friendships/show.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -1,6 +1,6 @@
<h1>Friendship</h1>
-<% display_user = !my_page? (@friendship.user_id) %>
+<% display_user = !my_page?(@friendship.user_id) %>
<% display_user_instance = display_user ? @friendship.user : @friendship.friend %>
@@ -80,7 +80,7 @@
<%= hidden_field_tag "accept_msg", "" %>
<% end %>
- <% form_tag (friendship_path(@friendship.friend_id, @friendship) + "?return_to=" + currentusers_things_url('friends'), :method => :delete) do %>
+ <% form_tag(user_friendship_path(@friendship.friend_id, @friendship) + "?return_to=" + currentusers_things_url('friends'), :method => :delete) do %>
<%= hidden_field_tag "reject_msg", "" %>
<% end %>
@@ -102,4 +102,4 @@
<div id="user_box" style="display: none; margin-top: 3em;">
<%= render :partial => "users/table", :locals => { :collection => [ display_user_instance ] } %>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/app/views/gadgets/_user_monitor.rhtml (2066 => 2067)
--- trunk/app/views/gadgets/_user_monitor.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/gadgets/_user_monitor.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -14,12 +14,12 @@
<li>
<%= icon "profile", user_url(current_user), nil, nil, " My Profile" %>
<span style="color: #666666; margin-left: 0.5em;">
- <small>[ <%= link_to "edit", edit_profile_path(current_user) -%> ]</small>
+ <small>[ <%= link_to "edit", edit_user_profile_path(current_user) -%> ]</small>
</span>
</li>
<li><%= messages_link(current_user, "My Messages") %></li>
<li><%= memberships_link(current_user, "My Memberships") %></li>
- <li><%= icon "history", userhistory_url(current_user), nil, nil, "My History" %></li>
+ <li><%= icon "history", user_userhistory_url(current_user), nil, nil, "My History" %></li>
<li><%= icon "news", home_url, nil, nil, "My News" %></li>
</ul>
@@ -59,8 +59,8 @@
<ul class="gadget_list">
<% current_user.friendships_pending.each do |friendship| %>
<li>
- <%= icon "user", friendship_path(current_user, friendship), nil, nil, "" %>
- <b><%= link_to truncate(h(friendship.user.name), trunc_length), friendship_path(current_user, friendship), :title => tooltip_title_attrib(h(friendship.user.name)) -%></b>
+ <%= icon "user", user_friendship_path(current_user, friendship), nil, nil, "" %>
+ <b><%= link_to truncate(h(friendship.user.name), trunc_length), user_friendship_path(current_user, friendship), :title => tooltip_title_attrib(h(friendship.user.name)) -%></b>
</li>
<% end %>
</ul>
Modified: trunk/app/views/memberships/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/memberships/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/memberships/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -7,7 +7,7 @@
<li><b>»</b></li>
- <li><%= link_to 'Memberships', memberships_path(@user) %></li>
+ <li><%= link_to 'Memberships', user_memberships_path(@user) %></li>
<% else %>
<li><%= link_to 'Memberships', url_for(:controller => :memberships) %>
<% end %>
@@ -15,5 +15,5 @@
<% if ["show"].include? controller.action_name.to_s %>
<li><b>»</b></li>
- <li><%= link_to "View: #{h(@membership.network.title)}", membership_path(@membership.user, @membership) %></li>
+ <li><%= link_to "View: #{h(@membership.network.title)}", user_membership_path(@membership.user, @membership) %></li>
<% end %>
Modified: trunk/app/views/memberships/new.rhtml (2066 => 2067)
--- trunk/app/views/memberships/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/memberships/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :membership %>
-<% form_for(:membership, :url ="" memberships_path(params[:user_id]), :html => {:id => 'memb_request_form'}) do |f| %>
+<% form_for(:membership, :url ="" user_memberships_path(params[:user_id]), :html => {:id => 'memb_request_form'}) do |f| %>
<%= f.hidden_field :user_id, :value => current_user.id %>
<center>
@@ -57,4 +57,4 @@
</div>
<% end %>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/memberships/show.rhtml (2066 => 2067)
--- trunk/app/views/memberships/show.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/memberships/show.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -38,7 +38,7 @@
is a member of:
<% end %>
<% else %>
- <%= membership_invite_request_action_message(allow_approval, @membership.is_invite?, link_to_function (h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3)) ) -%>
+ <%= membership_invite_request_action_message(allow_approval, @membership.is_invite?, link_to_function(h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3)) ) -%>
<% end %>
</b>
<br/>
@@ -104,11 +104,11 @@
<!-- These forms serve as 'data senders' for Accept/Reject buttons -->
- <% form_tag (accept_membership_path(current_user.id, @membership)) do %>
+ <% form_tag(accept_membership_path(current_user.id, @membership)) do %>
<%= hidden_field_tag "accept_msg", "" %>
<% end %>
- <% form_tag (membership_path(@membership.user_id, @membership) + "?return_to=" + currentusers_things_url('groups'), :method => :delete) do %>
+ <% form_tag(user_membership_path(@membership.user_id, @membership) + "?return_to=" + currentusers_things_url('groups'), :method => :delete) do %>
<%= hidden_field_tag "reject_msg", "" %>
<% end %>
@@ -137,4 +137,4 @@
<div id="user_box" style="display: none; margin-top: 3em;">
<%= render :partial => "users/table", :locals => { :collection => [ @membership.user ] } %>
<a name="user_box"></a>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/app/views/networks/_table.rhtml (2066 => 2067)
--- trunk/app/views/networks/_table.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/networks/_table.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -68,7 +68,7 @@
<% if mine? network -%>
<%= icon "manage", edit_group_path(network) %>
<% elsif logged_in? %> <!-- admins can't leave the group or request membership! -->
- <% if network.member? (current_user.id) %>
+ <% if network.member?(current_user.id) %>
<!-- 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 %>
Modified: trunk/app/views/notifier/friendship_request.rhtml (2066 => 2067)
--- trunk/app/views/notifier/friendship_request.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/notifier/friendship_request.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,11 +2,11 @@
<%= @friend_name %> wants to be your friend.
-Please go to <%= "http://" + @base_url + friendship_path(@user, @friendship) %> to confirm/reject this request.
+Please go to <%= "http://" + @base_url + user_friendship_path(@user, @friendship) %> to confirm/reject this request.
Your username is: <%= @user.username %>
Thanks,
- The myExperiment Team
-<%= BASE_URI -%>
\ No newline at end of file
+<%= BASE_URI -%>
Modified: trunk/app/views/notifier/membership_request.rhtml (2066 => 2067)
--- trunk/app/views/notifier/membership_request.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/notifier/membership_request.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -5,11 +5,11 @@
Name: <%= @network.title %>
Administrator: <%= @network.owner.name %>
-Please go to <%= "http://" + @base_url + membership_path(@requestor, @membership) %> to confirm/reject this request.
+Please go to <%= "http://" + @base_url + user_membership_path(@requestor, @membership) %> to confirm/reject this request.
Your username is: <%= @user.username %>
Thanks,
- The myExperiment Team
-<%= BASE_URI -%>
\ No newline at end of file
+<%= BASE_URI -%>
Modified: trunk/app/views/permissions/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/permissions/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/permissions/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -7,24 +7,24 @@
<li><b>»</b></li>
- <li><%= link_to 'Permissions', permissions_path(@policy) %></li>
+ <li><%= link_to 'Permissions', policy_permissions_path(@policy) %></li>
<% else %>
<li><%= link_to h(@permission.policy.name), policy_path(@permission.policy) %></li>
<li><b>»</b></li>
- <li><%= link_to 'Permissions', permissions_path(@permission.policy) %></li>
+ <li><%= link_to 'Permissions', policy_permissions_path(@permission.policy) %></li>
<% end %>
<% if ["show", "new", "edit"].include? controller.action_name.to_s %>
<li><b>»</b></li>
<% case controller.action_name.to_s; when "show" %>
- <li><%= link_to "View: #{contributor_name(@permission.contributor_id, @permission.contributor_type)}", permission_path(@policy, @permission) %></li>
+ <li><%= link_to "View: #{contributor_name(@permission.contributor_id, @permission.contributor_type)}", policy_permission_path(@policy, @permission) %></li>
<% when "new" %>
- <li><%= link_to "New Permission", new_permission_path(@permission.policy) %></li>
+ <li><%= link_to "New Permission", new_policy_permission_path(@permission.policy) %></li>
<% when "edit" %>
- <li><%= link_to "Edit: #{contributor_name(@permission.contributor_id, @permission.contributor_type)}", edit_permission_path(@policy, @permission) %></li>
+ <li><%= link_to "Edit: #{contributor_name(@permission.contributor_id, @permission.contributor_type)}", edit_policy_permission_path(@policy, @permission) %></li>
<% else %>
<!-- no breadcrumb -->
<% end %>
Modified: trunk/app/views/permissions/_subnav.rhtml (2066 => 2067)
--- trunk/app/views/permissions/_subnav.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/permissions/_subnav.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -1,6 +1,6 @@
<% if @permission.policy %>
<ul class="sectionIcons">
- <li><%= icon('new', new_permission_path(@permission.policy), nil, nil, 'New permission') %></li>
+ <li><%= icon('new', new_policy_permission_path(@permission.policy), nil, nil, 'New permission') %></li>
</ul>
<% end %>
Modified: trunk/app/views/permissions/edit.rhtml (2066 => 2067)
--- trunk/app/views/permissions/edit.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/permissions/edit.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :permission %>
-<% form_for(:permission, :url ="" permission_path(@permission.policy, @permission), :html => { :method => :put }) do |f| %>
+<% form_for(:permission, :url ="" policy_permission_path(@permission.policy, @permission), :html => { :method => :put }) do |f| %>
<p>
<b>Contributor</b><br />
<%= f.text_field :contributor_id %>
@@ -31,4 +31,4 @@
<p>
<%= submit_tag "Update" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/permissions/new.rhtml (2066 => 2067)
--- trunk/app/views/permissions/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/permissions/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :permission %>
-<% form_for(:permission, :url ="" permissions_path(params[:policy_id])) do |f| %>
+<% form_for(:permission, :url ="" policy_permissions_path(params[:policy_id])) do |f| %>
<% if params[:policy_id] %>
<p>
<b>Policy</b><br/>
@@ -71,4 +71,4 @@
<p>
<%= submit_tag "Create" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/pictures/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/pictures/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/pictures/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -8,7 +8,7 @@
<li><b>»</b></li>
<% end %>
-<li><%= link_to 'Pictures', pictures_path -%></li>
+<li><%= link_to 'Pictures', user_pictures_path -%></li>
<% if ["show", "new", "edit"].include? controller.action_name.to_s -%>
<li><b>»</b></li>
Modified: trunk/app/views/pictures/new.rhtml (2066 => 2067)
--- trunk/app/views/pictures/new.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/pictures/new.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :picture %>
-<% form_tag ({:action ="" :create}, :multipart => true) do %>
+<% form_tag({:action ="" :create}, :multipart => true) do %>
<%= hidden_field_tag(:redirect_to, params[:return_to] ? params[:return_to] : user_pictures_path(current_user.id) ) -%>
<br/>
@@ -21,4 +21,4 @@
or <%= link_to "Cancel", params[:return_to] ? params[:return_to] : user_pictures_path(current_user.id) -%>
</center>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/profiles/_form.rhtml (2066 => 2067)
--- trunk/app/views/profiles/_form.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/profiles/_form.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -6,8 +6,8 @@
<h2>Your profile pictures</h2>
<ul class="sectionIcons">
- <li><%= icon("pictures", pictures_path(@user), nil, nil, "Manage Profile Pictures") %></li>
- <li><%= icon('avatar', new_picture_path(@user) + "?return_to=" + edit_profile_path(current_user.id), nil, nil, 'Upload New Profile Pic')%></li>
+ <li><%= icon("pictures", user_pictures_path(@user), nil, nil, "Manage Profile Pictures") %></li>
+ <li><%= icon('avatar', new_user_picture_path(@user) + "?return_to=" + edit_user_profile_path(current_user.id), nil, nil, 'Upload New Profile Pic')%></li>
</ul>
<p class="box_standout" style="text-align: center; padding: 0.3em 0.5em; margin: 0.3em 0;">
@@ -23,7 +23,7 @@
<% pictures.each do |p| %>
<li>
<center>
- <%= image_tag url_for :controller => 'pictures', :action ="" 'show', :id => p.id, :size => '60x60' %>
+ <%= image_tag(url_for(:controller => 'pictures', :action ="" 'show', :id => p.id, :size => '60x60')) %>
<br/>
<%= form.radio_button :picture_id, p.id %>
</center>
@@ -110,4 +110,4 @@
<%= fckeditor_textarea(:profile, :body, :toolbarSet => 'Simple', :width => '700px', :height => '300px') %>
<br/>
-<br/>
\ No newline at end of file
+<br/>
Modified: trunk/app/views/profiles/edit.rhtml (2066 => 2067)
--- trunk/app/views/profiles/edit.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/profiles/edit.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -2,7 +2,7 @@
<%= error_messages_for :profile %>
-<% form_for(:profile, :url ="" profile_path(@profile.user_id), :html => { :method => :put }) do |f| %>
+<% form_for(:profile, :url ="" user_profile_path(@profile.user_id), :html => { :method => :put }) do |f| %>
<% if mine? @user %>
<%= render :partial => "form", :object => f, :locals => { :pictures => @user.pictures } %>
Modified: trunk/app/views/reviews/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/reviews/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/reviews/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -4,7 +4,7 @@
<li><%= link_to "#{h(@reviewable.title)}", workflow_path(@reviewable) -%></li>
<li><b>»</b></li>
-<li><%= link_to 'Reviews', reviews_path(@reviewable) -%></li>
+<li><%= link_to 'Reviews', workflow_reviews_path(@reviewable) -%></li>
<% if ["show", "new", "edit"].include? controller.action_name.to_s -%>
<li><b>»</b></li>
@@ -14,7 +14,7 @@
<% when "new" -%>
<li>New Review</li>
<% when "edit" -%>
- <li><%= link_to "#{h(@review.title)}", review_path(@reviewable, @review) -%></li>
+ <li><%= link_to "#{h(@review.title)}", workflow_review_path(@reviewable, @review) -%></li>
<li><b>»</b></li>
<li>Edit</li>
<% else -%>
Modified: trunk/app/views/users/_table.rhtml (2066 => 2067)
--- trunk/app/views/users/_table.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/users/_table.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -77,14 +77,14 @@
<%= icon "edit", edit_user_path(user), nil, nil, "Edit" %>
<% else %>
<!-- check if the profile that we are viewing now is a friend of current user -> stored for better performance -->
- <% this_user_is_friend_of_current_user = user.friend? current_user.id %>
+ <% this_user_is_friend_of_current_user = user.friend?(current_user.id) %>
<% unless !logged_in? || this_user_is_friend_of_current_user || current_user.friendship_pending?(user.id) %>
- <%= icon "friendship", new_friendship_url(:user_id => user.id), nil, nil, "Request Friendship" %>
+ <%= icon "friendship", new_user_friendship_url(:user_id => user.id), nil, nil, "Request Friendship" %>
<% end %>
<%= icon "message", new_message_path(:user_id => user.id), nil, nil, "Send Message" %>
<% if logged_in? && this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(user.id) %>
- <%= icon "friend_delete", friendship_path(master_id, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
+ <%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
<% end %>
<% end %>
</td>
Modified: trunk/app/views/users/show.rhtml (2066 => 2067)
--- trunk/app/views/users/show.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/users/show.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -6,7 +6,7 @@
<% if friend_id == @user.id %>
You have already sent a friendship request to this person. Awaiting their confirmation.
<% else %>
- This person has sent you a friendship request. Awaiting your <%= link_to "confirmation", friendship_path(current_user, friendship_obj) -%>.
+ This person has sent you a friendship request. Awaiting your <%= link_to "confirmation", user_friendship_path(current_user, friendship_obj) -%>.
<% end %>
</b></div>
<% end %>
@@ -47,7 +47,7 @@
<li><%= icon("message", new_message_path(:user_id => @user.id), nil, nil, "Send Message") %></li>
<% if this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(@user.id) %>
- <li><%= icon "friend_delete", friendship_path(master_id, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
+ <li><%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
<% end %>
<% end %>
@@ -378,7 +378,7 @@
<% end %>
<% if mine? @user %>
- <p style="color: #666666;">[ <%= link_to 'View all Memberships in detail', memberships_path(@user) %> ]</p>
+ <p style="color: #666666;">[ <%= link_to 'View all Memberships in detail', user_memberships_path(@user) %> ]</p>
<% end %>
<% when "Workflows" %>
Modified: trunk/app/views/viewings/_breadcrumbs.rhtml (2066 => 2067)
--- trunk/app/views/viewings/_breadcrumbs.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/viewings/_breadcrumbs.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -6,13 +6,13 @@
<li><b>»</b></li>
-<li><%= link_to 'Viewings', viewings_path(@contribution) %>
+<li><%= link_to 'Viewings', contribution_viewings_path(@contribution) %>
<% if ["show"].include? controller.action_name.to_s %>
<li><b>»</b></li>
<% case controller.action_name.to_s; when "show" %>
- <li><%= link_to datetime(@viewing.created_at, false), viewing_path(@contribution, @viewing) %></li>
+ <li><%= link_to datetime(@viewing.created_at, false), contribution_viewing_path(@contribution, @viewing) %></li>
<% else %>
<!-- no breadcrumb -->
<% end %>
Modified: trunk/app/views/workflows/_main_metadata_form.rhtml (2066 => 2067)
--- trunk/app/views/workflows/_main_metadata_form.rhtml 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/app/views/workflows/_main_metadata_form.rhtml 2009-01-20 15:16:09 UTC (rev 2067)
@@ -20,7 +20,7 @@
<% if show_infer_option %>
<p>
<label for=""
- <%= radio_button_tag ("metadata_choice",
+ <%= radio_button_tag("metadata_choice",
"infer",
main_metadata_infer_selected,
: "$('metadata_choice_custom').checked=false;$('div_main_metadata_custom').hide();return true;") -%>
@@ -32,7 +32,7 @@
<p style="margin-top: 0.1em;">
<label for=""
- <%= radio_button_tag ("metadata_choice",
+ <%= radio_button_tag("metadata_choice",
"custom",
!main_metadata_infer_selected,
: "$('metadata_choice_infer').checked=false;$('div_main_metadata_custom').show();return true;") -%>
@@ -76,4 +76,4 @@
</div>
</div>
-</center>
\ No newline at end of file
+</center>
Modified: trunk/test/functional/friendships_controller_test.rb (2066 => 2067)
--- trunk/test/functional/friendships_controller_test.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/test/functional/friendships_controller_test.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -39,7 +39,7 @@
post :create, :user_id => users(:admin).id, :friendship => { :user_id => users(:john).id, :friend_id => users(:admin).id }
assert_equal old_count+1, Friendship.count
- assert_redirected_to friendship_path(users(:john).id, assigns(:friendship))
+ assert_redirected_to user_friendship_path(users(:john).id, assigns(:friendship))
end
def test_should_show_friendship
Modified: trunk/test/functional/memberships_controller_test.rb (2066 => 2067)
--- trunk/test/functional/memberships_controller_test.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/test/functional/memberships_controller_test.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -41,7 +41,7 @@
:membership => { :user_id => users(:john).id, :network_id => networks(:spare_network).id } #, :message => "Can I Join Please?" }
assert_equal old_count+1, Membership.count
- assert_redirected_to membership_path(users(:john).id, assigns(:membership))
+ assert_redirected_to user_membership_path(users(:john).id, assigns(:membership))
end
# not convinced that this test is working
Modified: trunk/test/functional/packs_controller_test.rb (2066 => 2067)
--- trunk/test/functional/packs_controller_test.rb 2009-01-19 16:25:44 UTC (rev 2066)
+++ trunk/test/functional/packs_controller_test.rb 2009-01-20 15:16:09 UTC (rev 2067)
@@ -49,7 +49,7 @@
post :create, :pack => { :title => 'my new pack', :description => 'a new pack lalalala' }
assert_response :redirect
- assert_redirected_to pack_url assigns(:pack)
+ assert_redirected_to(pack_url(assigns(:pack)))
assert_equal num_packs + 1, Pack.count
end