Changeset 1294

Show
Ignore:
Timestamp:
01/13/08 14:48:24 (9 months ago)
Author:
jon.egil.stra..@gmail.com
Message:

Fixed global_helper and application view to reference controller

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mrblog/branches/0.4.2/app/controllers/application.rb

    r1203 r1294  
    22class Application < Merb::Controller 
    33  include AuthenticatedSystem 
     4  #include Merb::GlobalHelper 
    45  
    56end   

  • mrblog/branches/0.4.2/app/helpers/global_helper.rb

    r1203 r1294  
    2424     
    2525    def logged_in? 
    26       @controller.send(:logged_in?) 
     26      controller.send(:logged_in?) 
    2727    end 
    2828     
    2929    def current_user 
    30       @controller.send(:current_user) 
     30      controller.send(:current_user) 
    3131    end 
    3232     
    3333  end 
    3434end     
    35      
    36      
    37      

  • mrblog/branches/0.4.2/app/views/layout/application.html.erb

    r1203 r1294  
    1818           <a href="http://merb.devjavu.com/">Trac</a> 
    1919           <%= " | #{link_to "Login", "/account/login"}" if !logged_in? %> 
    20            <%= " | #{link_to "Blog", "/"}" if !logged_in? && @controller.class != Blog || params[:action] != "index" %>           
     20           <%= " | #{link_to "Blog", "/"}" if !logged_in? && controller.class != Blog || params[:action] != "index" %>            
    2121           <%= " | #{link_to "Logout #{current_user.login}", "/account/login"}" if logged_in? %> 
    2222           <%= " | #{link_to "Admin", "/admin"}" if current_user && current_user.admin? %> 

  • mrblog/branches/0.4.2/config/merb_init.rb

    r1203 r1294  
    2020  PER_PAGE = 10 
    2121end 
    22