Give node lists a flag column and a shared action bar

2 files changed, 2 insertions, 4 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index ca30976f..447d596d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -20,9 +20,7 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.includes(:head, :draft)
-      .order('id DESC')
-      .paginate(:page => params[:page], :per_page => 25)
+    @nodes = index_matching(Node.root.descendants)
   end
 
   def new
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b06d11fd..20355aa8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -140,7 +140,7 @@ class UsersController < ApplicationController
 
     def verify_status
       @user ||= User.new
-      unless @user.id == current_user.id || current_user.admin
+      unless @user.id == current_user.id || current_user.is_admin?
         deny_user_access
       end
     end