New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

expand indirect group memberships #90

Closed
wants to merge 14 commits into
base: master
from

add support for custom views by specifying an alternate path to searc…

…h before trying the default location
  • Loading branch information...
S. Brent Faulkner
S. Brent Faulkner committed Feb 8, 2011
commit 738add8ade5fc14943eb0436bc61f5a9166d8471
View
@@ -274,6 +274,7 @@ def self.init_database!
@organization = settings.config[:organization]
@uri_path = settings.config[:uri_path]
@infoline = settings.config[:infoline]
@custom_views = settings.config[:custom_views]
end
# The #.#.# comments (e.g. "2.1.3") refer to section numbers in the CAS protocol spec
@@ -676,6 +677,12 @@ def serialize_extra_attribute(builder, value)
builder.cdata! value.to_yaml
end
end
def render(engine, data, options = {}, locals = {}, &block)
super engine, data, options.merge(:views => settings.config[:custom_views]), locals, &block
rescue Errno::ENOENT
super engine, data, options, locals, &block
end
end
end
@@ -474,8 +474,8 @@ organization: CAS
# if you prefer to have no extra text shown at the bottom of the login box.
infoline: Powered by <a href="http://code.google.com/p/rubycas-server/">RubyCAS-Server</a>
# Custom views file. Overrides methodes in lib/casserver/views.rb
#custom_views_file: /path/to/custom/views.rb
# Custom views location. Overrides templates in lib/casserver/views
#custom_views: /path/to/custom/views
##### LOCALIZATION (L10N) #######################################################
# The server will attempt to detect the user's locale and show text in the
View
@@ -25,7 +25,7 @@ organization: "RSPEC-TEST"
infoline: "This is an rspec test."
#custom_views_file: /path/to/custom/views.rb
#custom_views: /path/to/custom/views
default_locale: en
View
@@ -25,7 +25,7 @@ organization: "RSPEC-TEST"
infoline: "This is an rspec test."
#custom_views_file: /path/to/custom/views.rb
#custom_views: /path/to/custom/views
default_locale: en
ProTip! Use n and p to navigate between commits in a pull request.