Diff
Modified: trunk/app/controllers/blog_posts_controller.rb (2726 => 2727)
--- trunk/app/controllers/blog_posts_controller.rb 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/controllers/blog_posts_controller.rb 2011-10-20 22:08:20 UTC (rev 2727)
@@ -122,7 +122,7 @@
(err = BlogPost.new.errors).add(attr, message)
respond_to do |format|
- format.html { redirect_to blog_posts_url(params[:blog_id]) }
+ format.html { redirect_to blog_blog_posts_url(params[:blog_id]) }
end
end
end
Modified: trunk/app/views/blog_posts/_breadcrumbs.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/_breadcrumbs.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/_breadcrumbs.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -8,11 +8,11 @@
<li><b>»</b></li>
<% case controller.action_name.to_s; when "show" %>
- <li><%= link_to "View: #{h(@blog_post.title)}", blog_post_path(@blog_post.blog, @blog_post) %></li>
+ <li><%= link_to "View: #{h(@blog_post.title)}", blog_blog_post_path(@blog_post.blog, @blog_post) %></li>
<% when "new" %>
- <li><%= link_to "New Blog Post", new_blog_post_path(@blog_post.blog) %></li>
+ <li><%= link_to "New Blog Post", new_blog_blog_post_path(@blog_post.blog) %></li>
<% when "edit" %>
- <li><%= link_to "Edit: #{h(@blog_post.title)}", edit_blog_post_path(@blog_post.blog, @blog_post) %>
+ <li><%= link_to "Edit: #{h(@blog_post.title)}", edit_blog_blog_post_path(@blog_post.blog, @blog_post) %>
<% else %>
<!-- no breadcrumb -->
<% end %>
Modified: trunk/app/views/blog_posts/_post.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/_post.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/_post.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -2,8 +2,8 @@
<b><%=h post.title %></b> (<%=datetime post.created_at, false %>)
<% if my_page?(post.blog.contribution.contributor_id, post.blog.contribution.contributor_type) %>
- <%= icon "edit", edit_blog_post_path(post.blog, post) %>
- <%= icon "destroy", blog_post_path(post.blog, post), nil, :confirm => "Are you sure?", :method => "delete" %>
+ <%= icon "edit", edit_blog_blog_post_path(post.blog, post) %>
+ <%= icon "destroy", blog_blog_post_path(post.blog, post), nil, :confirm => "Are you sure?", :method => "delete" %>
<% end %>
</p>
Modified: trunk/app/views/blog_posts/_subnav.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/_subnav.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/_subnav.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -2,7 +2,7 @@
<% if logged_in? && Authorization.is_authorized?("edit", nil, @blog_post.blog, current_user) %>
<ul class="sectionIcons">
- <li><%= link_to 'Edit Blog Post', edit_blog_post_path(@blog_post.blog, @blog_post) %></li>
+ <li><%= link_to 'Edit Blog Post', edit_blog_blog_post_path(@blog_post.blog, @blog_post) %></li>
</ul>
<% end %>
Modified: trunk/app/views/blog_posts/edit.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/edit.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/edit.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -2,7 +2,7 @@
<%= error_messages_for :blog_post %>
-<% form_for(:blog_post, :url ="" blog_post_path, :html => { :method => :put }) do |f| %>
+<% form_for(:blog_post, :url ="" blog_blog_post_path, :html => { :method => :put }) do |f| %>
<p>
<b>Title</b><br />
<%= f.text_field :title %>
@@ -16,4 +16,4 @@
<p>
<%= submit_tag "Update" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/blog_posts/index.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/index.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/index.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -14,11 +14,11 @@
<td><%=h blog_post.title %></td>
<td><%=datetime blog_post.created_at, false %></td>
<td><%=datetime blog_post.updated_at, false %></td>
- <td><%= link_to 'View', blog_post_path(blog_post.blog, blog_post) %></td>
- <td><%= link_to 'Edit', edit_blog_post_path(blog_post.blog, blog_post) %></td>
- <td><%= link_to 'Delete', blog_post_path(blog_post.blog, blog_post), :confirm => 'Are you sure?', :method => :delete %></td>
+ <td><%= link_to 'View', blog_blog_post_path(blog_post.blog, blog_post) %></td>
+ <td><%= link_to 'Edit', edit_blog_blog_post_path(blog_post.blog, blog_post) %></td>
+ <td><%= link_to 'Delete', blog_blog_post_path(blog_post.blog, blog_post), :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</table>
-<br />
\ No newline at end of file
+<br />
Modified: trunk/app/views/blog_posts/new.rhtml (2726 => 2727)
--- trunk/app/views/blog_posts/new.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blog_posts/new.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -2,7 +2,7 @@
<%= error_messages_for :blog_post %>
-<% form_for(:blog_post, :url ="" blog_posts_path(@blog_post.blog)) do |f| %>
+<% form_for(:blog_post, :url ="" blog_blog_posts_path(@blog_post.blog)) do |f| %>
<%= f.hidden_field :blog_id %>
<p>
@@ -18,4 +18,4 @@
<p>
<%= submit_tag "Post" %>
</p>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/blogs/show.rhtml (2726 => 2727)
--- trunk/app/views/blogs/show.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/app/views/blogs/show.rhtml 2011-10-20 22:08:20 UTC (rev 2727)
@@ -7,7 +7,7 @@
<% if logged_in? %>
<ul class="sectionIcons">
<% if Authorization.is_authorized?("edit", nil, @blog, current_user) %>
- <li><%= icon('new', new_blog_post_path(@blog), nil, nil, "New post") %></li>
+ <li><%= icon('new', new_blog_blog_post_path(@blog), nil, nil, "New post") %></li>
<li><%= icon('edit', edit_blog_path(@blog), nil, nil, 'Edit ' + truncate(@blog.title, 10)) %></li>
<% end %>
Modified: trunk/lib/rest.rb (2726 => 2727)
--- trunk/lib/rest.rb 2011-10-20 21:59:30 UTC (rev 2726)
+++ trunk/lib/rest.rb 2011-10-20 22:08:20 UTC (rev 2727)
@@ -562,7 +562,7 @@
when 'Comment'; return "#{rest_resource_uri(ob.commentable)}/comments/#{ob.id}"
when 'Bookmark'; return nil
when 'Blog'; return blog_url(ob)
- when 'BlogPost'; return blog_post_url(ob.blog, ob)
+ when 'BlogPost'; return blog_blog_post_url(ob.blog, ob)
when 'Rating'; return "#{rest_resource_uri(ob.rateable)}/ratings/#{ob.id}"
when 'Tag'; return tag_url(ob)
when 'Picture'; return user_picture_url(ob.owner, ob)