diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-11 17:19:55 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-11 17:19:55 -0700 |
| commit | 72357e351d9dbe312f978bc1e2ab0630ed4df03d (patch) | |
| tree | e28775b2fcff8b0d17663e31219aac783cb53ba3 /app/controllers/admin_censor_rule_controller.rb | |
| parent | 84e81cbd2b0f98196050d3f5f758ced8a4f841df (diff) | |
| parent | 21ccc19acbe9d8c45c479917e6d53eb1d4a7f35c (diff) | |
Merge remote-tracking branch 'openaustralia_github/make_ui_for_links_in_admin_interface_consistent' into develop
Conflicts:
app/views/admin_censor_rule/new.rhtml
app/views/admin_general/index.rhtml
app/views/admin_general/timeline.rhtml
app/views/admin_request/_some_requests.rhtml
app/views/admin_request/show.rhtml
app/views/admin_track/_some_tracks.rhtml
Diffstat (limited to 'app/controllers/admin_censor_rule_controller.rb')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index f6abc70df..d3e9e47d2 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -10,7 +10,7 @@ class AdminCensorRuleController < AdminController @info_request = InfoRequest.find(params[:info_request_id]) end if params[:user_id] - @user = User.find(params[:user_id]) + @censor_user = User.find(params[:user_id]) end end |