diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-08-01 14:39:18 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-08-01 14:39:18 +0100 |
| commit | 67a3a43cc26f8ad7218f33a13af04c3c74347866 (patch) | |
| tree | 3fc5f27905332ba4647915eb5823d3d37615fe4c /app/controllers/admin_censor_rule_controller.rb | |
| parent | c1d2580892033d28ff05f3d47cee78aaef963c29 (diff) | |
| parent | cc3268df4c9de319ea16aa99238e3c4c40dae7c5 (diff) | |
Merge branch 'develop' into wdtk
Diffstat (limited to 'app/controllers/admin_censor_rule_controller.rb')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index 52df8dfc1..ec86cdf8e 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -31,6 +31,8 @@ class AdminCensorRuleController < AdminController redirect_to admin_url('request/show/' + @censor_rule.info_request.id.to_s) elsif !@censor_rule.user.nil? redirect_to admin_url('user/show/' + @censor_rule.user.id.to_s) + elsif @censor_rule.regexp? + redirect_to admin_url('') else raise "internal error" end |