Fixing issue #19 for realsies (oriented by tracking)

This commit is contained in:
2014-04-10 20:10:04 -07:00
parent 13e72fef23
commit 16c75b2d0f
9 changed files with 28 additions and 5 deletions

View File

@@ -18,7 +18,7 @@ class ContractsController < ApplicationController
def create
Rails.logger.info "CONTRACT"
Rails.logger.info @contract.inspect
@contract.created_by = current_user.id
@contract.created_by = current_user
respond_to do |format|
if @contract.save
format.html { redirect_to @contract, :notice => 'Contract was successfully created.' }

View File

@@ -124,6 +124,9 @@ class UsersController < ApplicationController
# POST /users
# POST /users.json
def create
# update oriented_by only if orientation has been set
@user.oriented_by_id = current_user.id unless @user.orientation.blank?
respond_to do |format|
if @user.save
format.html { redirect_to @user, :notice => 'User was successfully created.' }
@@ -138,6 +141,10 @@ class UsersController < ApplicationController
# PUT /users/1
# PUT /users/1.json
def update
# update oriented_by only if it's blank but the (new) orientation isn't blank
# gotta test the params because they don't get applied til below.
@user.oriented_by_id = current_user.id if @user.oriented_by.blank? && (!params[:user]["orientation(1i)"].blank?)
respond_to do |format|
if @user.update_attributes(params[:user])
format.html { redirect_to @user, :notice => 'User was successfully updated.' }