Skip to content

Commit

Permalink
Ruby 2.x: Initialize more session with @session
Browse files Browse the repository at this point in the history
  • Loading branch information
ngiger committed Dec 15, 2015
1 parent b6d5332 commit 858d84f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/view/personal.rb
Expand Up @@ -12,13 +12,13 @@
module ODDB
module View
module Personal
def welcome(model, session)
def welcome(model, session=@session)
parts = []
user = session.user
div = HtmlGrid::Div.new(model, session, self)
div.css_class = 'personal'
if(user.is_a?(ODDB::YusUser))
if company = @session.app.yus_model(user.name) and
if company = session.app.yus_model(user.name) and
logo_filename = company.logo_filename
if (company.url and !company.url.empty?)
link = HtmlGrid::HttpLink.new(:url, company, session, self)
Expand Down
8 changes: 4 additions & 4 deletions src/view/publictemplate.rb
Expand Up @@ -58,7 +58,7 @@ def init
@additional_javascripts = []
super
end
def content(model, session)
def content(model, session=@session)
self::class::CONTENT.new(model, session, self)
end
def css_link(context, path=nil)
Expand Down Expand Up @@ -108,10 +108,10 @@ def dynamic_html_headers(context)
}
headers
end
def foot(model, session)
def foot(model, session=@session)
self::class::FOOT.new(model, session, self) unless self::class::FOOT.nil?
end
def head(model, session)
def head(model, session=@session)
self::class::HEAD.new(model, session, self) unless self::class::HEAD.nil?
end
def javascripts(context)
Expand Down Expand Up @@ -146,7 +146,7 @@ def title_part_three
@lookandfeel.lookup(event)
end
end
def topfoot(model, session)
def topfoot(model, session=@session)
if(@lookandfeel.enabled?(:just_medical_structure, false))
just_medical(model, session)
elsif(@lookandfeel.enabled?(:oekk_structure, false))
Expand Down

0 comments on commit 858d84f

Please sign in to comment.