summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
commit6a3eb3a21958e4bc1a73e5774c3717fc01ee64e0 (patch)
tree933902730c79edb8f1f8372ce6af6217433c9a84 /app/controllers
parentea70e08534319dd3f15c34859c498771fa7d9b32 (diff)
parenta74efe4bb1b5afeaf892d18ba2e7969ed17b4099 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/gemeinschaft_setups_controller.rb18
1 files changed, 5 insertions, 13 deletions
diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index dbe8ff5..27c0a83 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -1,8 +1,12 @@
class GemeinschaftSetupsController < ApplicationController
+ # We use the heater rake task to generate this file.
+ # So it loads super fast even on slow machines.
+ #
+ caches_page :new, :gzip => :best_compression
+
load_and_authorize_resource :gemeinschaft_setup
skip_before_filter :go_to_setup_if_new_installation
- # before_filter :redirect_if_not_a_fresh_installation
def new
@user = @gemeinschaft_setup.build_user(
@@ -62,16 +66,4 @@ class GemeinschaftSetupsController < ApplicationController
end
end
- private
-
- def redirect_if_not_a_fresh_installation
- if GemeinschaftSetup.all.count > 0
- if current_user
- redirect_to root_url , :alert => t('gemeinschaft_setups.initial_setup.access_denied_only_available_on_a_new_system')
- else
- redirect_to log_in_path , :alert => t('gemeinschaft_setups.initial_setup.access_denied_only_available_on_a_new_system')
- end
- end
- end
-
end