diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
| commit | cd0c59ae6177b8b93971735887657314b6888a3c (patch) | |
| tree | d39b06cd424e3345a3cba97f56a44c920c06ec97 /certs/app/controllers/certs_controller.rb | |
| parent | be2d8fbd65f4ed2e1e97b19a3322da20e2fb4eda (diff) | |
| parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
Merge branch 'master' into feature/removing-email-aliases
Diffstat (limited to 'certs/app/controllers/certs_controller.rb')
| -rw-r--r-- | certs/app/controllers/certs_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/certs/app/controllers/certs_controller.rb b/certs/app/controllers/certs_controller.rb index 402bef3..d81aea0 100644 --- a/certs/app/controllers/certs_controller.rb +++ b/certs/app/controllers/certs_controller.rb @@ -4,8 +4,11 @@ class CertsController < ApplicationController # GET /cert def show - @cert = Cert.pick_from_pool - render :text => @cert.zipped, :content_type => 'text/plain' + @cert = LeapCA::Cert.pick_from_pool + render :text => @cert.key + @cert.cert, :content_type => 'text/plain' + rescue RECORD_NOT_FOUND + flash[:error] = t(:cert_pool_empty) + redirect_to root_path end end |