diff options
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | app/controllers/public_body_controller.rb | 2 | ||||
| -rw-r--r-- | config/environment.rb | 8 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 55f1b9652..78f90064f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,7 @@ url = https://github.com/rails/rails.git [submodule "vendor/rails-locales"] path = vendor/rails-locales - url = https://github.com/svenfuchs/rails-i18n.git
\ No newline at end of file + url = https://github.com/svenfuchs/rails-i18n.git +[submodule "vendor/plugins/alavetelitheme"] + path = vendor/plugins/alavetelitheme + url = https://github.com/sebbacon/alavetelitheme.git
\ No newline at end of file diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 439e9d579..cf64046ea 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -88,7 +88,7 @@ class PublicBodyController < ApplicationController and has_tag_string_tags.name in (' + category_list + ')) = 0', @locale] elsif @tag.size == 1 @tag.upcase! - conditions = [locale_condition + ' AND first_letter = ?', @locale, @tag] + conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @locale, @tag] elsif @tag.include?(":") name, value = HasTagString::HasTagStringTag.split_tag_into_name_value(@tag) conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id diff --git a/config/environment.rb b/config/environment.rb index ea92e4d99..7a6c5433f 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -55,6 +55,11 @@ Rails::Initializer.run do |config| # # Specify gems that this application depends on and have them installed with rake gems:install config.gem "fast_gettext", :version => '>=0.4.8' + config.gem "rack", :version => '1.1.0' + config.gem "recaptcha", :lib => "recaptcha/rails" + config.gem 'rspec', :lib => false, :version => '1.3.1' + config.gem 'rspec-rails', :lib => false, :version => '1.3.3' + config.gem 'will_paginate', :version => '~> 2.3.11', :source => 'http://gemcutter.org' #GettextI18nRails.translations_are_html_safe = true # Your secret key for verifying cookie session data integrity. # If you change this key, all old sessions will become invalid! @@ -121,11 +126,10 @@ require 'tmail_extensions.rb' require 'activesupport_cache_extensions.rb' require 'public_body_categories.rb' require 'timezone_fixes.rb' -require 'fcgi_fixes.rb' require 'use_spans_for_errors.rb' require 'make_html_4_compliant.rb' require 'activerecord_errors_extensions.rb' require 'willpaginate_hack.rb' require 'sendmail_return_path.rb' require 'tnef.rb' -require 'i18n_fixes.rb'
\ No newline at end of file +require 'i18n_fixes.rb' diff --git a/config/routes.rb b/config/routes.rb index 7af41ac92..edb2c7c5f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -109,6 +109,8 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'help' do |help| help.help_unhappy '/help/unhappy/:url_title', :action => 'unhappy' + help.help_about '/help/about', :action => 'about' + help.help_contact '/help/contact', :action => 'contact' help.help_general '/help/:action', :action => :action end |