navigation_generator.rb in rails_layout-1.0.26

- old
+ new

@@ -44,11 +44,11 @@
         if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
           if User.column_names.include? 'role'
             # suitable for role-based authorization
             append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
 <% if user_signed_in? %>
-  <% if current_user.admin? %>
+  <% if current_user.try(:admin?) %>
     <li><%= link_to 'Users', users_path %></li>
   <% end %>
 <% end %>
 LINKS
             end
@@ -63,10 +63,10 @@
           end
         end
         # UPMIN (administrative dashboard)
         if File.exists?('config/initializers/upmin.rb')
           navlink = "    <li><%= link_to 'Admin', '/admin' %></li>"
-          inject_into_file 'app/views/layouts/_navigation_links.html.erb', navlink + "\n", :after => "<% if current_user.admin? %>\n"
+          inject_into_file 'app/views/layouts/_navigation_links.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
         end
       end
 
       def add_tests
         return unless File.exists?('config/initializers/devise.rb')