@@ -16,7 +16,7 @@ class ApplicationController < ActionController::Base end def require_admin - redirect_to(page_path('home')) unless logged_in? && current_user.admin? + redirect_to(page_path('home')) unless admin? end end app/controllers/application.rb @@ -4,10 +4,10 @@ <li><%= link_to 'View all revisions', revisions_page_url(:id => page.permalink) %></li> <li><%= link_to 'View previous revision', revision_page_url(:id => page.permalink, :version => version.previous.version) if version.previous %></li> <li><%= link_to 'View next revision', revision_page_url(:id => page.permalink, :version => version.next.version) if version.next %></li> - <li><%= link_to((page.locked? ? "Unlock this page" : "Lock this page"), lock_page_path(page)) if logged_in? && current_user.admin? %></li> + <li><%= link_to((page.locked? ? "Unlock this page" : "Lock this page"), lock_page_path(page)) if admin? %></li> <% if page.version == version.version %> - <li><%= link_to 'Edit this page', edit_page_path(page) unless page.locked? && logged_in? && !current_user.admin? %></li> - <li><%= link_to "Delete this page and all revisions", page_path(page), :method => :delete if logged_in? && current_user.admin? && page.permalink != 'home' %></li> + <li><%= link_to 'Edit this page', edit_page_path(page) unless page.locked? && !admin? %></li> + <li><%= link_to "Delete this page and all revisions", page_path(page), :method => :delete if admin? && page.permalink != 'home' %></li> <li><%= link_to 'Return to home', pages_path unless page.permalink == "home" %></li> <li>Inbound links: <ul> @@ -17,7 +17,7 @@ </ul> </li> <% else %> - <li><%= link_to "Rollback to this revision", rollback_page_url(:id => page.permalink, :version => (version.version)) unless (page.locked?) %></li> + <li><%= link_to "Rollback to this revision", rollback_page_url(:id => page.permalink, :version => (version.version)) unless (page.locked? && !admin?) %></li> <li><%= link_to 'Return to current revision', wiki_page_url(page.permalink) %></li> <% end %> <%# FIXME Clean up this revision link logic %> app/views/pages/_right.html.erb @@ -96,7 +96,7 @@ module AuthenticatedSystem # Inclusion hook to make #current_user and #logged_in? # available as ActionView helper methods. def self.included(base) - base.send :helper_method, :current_user, :logged_in? + base.send :helper_method, :current_user, :logged_in?, :admin? end # Called from #current_user. First attempt to login by the user id stored in the session. lib/authenticated_system.rb 902961c070dc8f7e76fca8f5c7c4944e072332c3 Codafoo codafoo@gmail.com http://github.com/queso/signal-wiki/commit/16d0139ed412d2d7d7a8b1caf102932c1d3d155d 16d0139ed412d2d7d7a8b1caf102932c1d3d155d 2008-04-18T10:49:58-07:00 2008-04-17T00:48:42-07:00 Included admin? function so someone doesn't have to type logged_in? && current_user.admin? every time b254c40e5d2a385fee8540d57b96c6850772f8b5 Josh Owens joshua.owens@gmail.com