diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 23:30:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 23:30:40 -0400 |
| commit | 1429cd41bb4af3429f28dc97efd6994433ebde7b (patch) | |
| tree | 5db4b36315bd4d6cab60263bbf8a8180dec3fee6 /app/controllers | |
| parent | 081b7cb82d5869bc43605223c301f7fed8dd50e2 (diff) | |
| parent | a6f801b7f5a2b9ca1b61ecc305a31f76be8c8238 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/alerts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/pms_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb index 333022a..6ab3663 100644 --- a/app/controllers/alerts_controller.rb +++ b/app/controllers/alerts_controller.rb @@ -23,7 +23,7 @@ class AlertsController < ApplicationController # POST /alerts.json def create @alert = Alert.new(alert_params) - + @alert.author = current_user respond_to do |format| if @alert.save format.html { redirect_to @alert, notice: 'Alert was successfully created.' } diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb index 2cb55f8..1d6540d 100644 --- a/app/controllers/pms_controller.rb +++ b/app/controllers/pms_controller.rb @@ -24,8 +24,8 @@ class PmsController < ApplicationController def create @pm = Pm.new(pm_params) @pm.author = current_user - #require 'pp' - #pp pm_params['recipient_id'] + require 'pp' + pp @pm.message @pm.recipient = User.find_by_user_name(pm_params['recipient_id']) @pm.author.send_message(@pm.recipient, @pm.message, 'Default') |