Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
This commit is contained in:
commit
d8311fa7cc
|
@ -2,7 +2,7 @@ class Contract < ActiveRecord::Base
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
attr_accessible :user_id, :first_name, :last_name, :signed_at, :document, :document_file_name, :document_content_type, :document_file_size, :document_updated_at
|
attr_accessible :user_id, :first_name, :last_name, :signed_at, :document, :document_file_name, :document_content_type, :document_file_size, :document_updated_at
|
||||||
|
|
||||||
validates_presence_of :first_name, :last_name, :signed_at
|
validates_presence_of :first_name, :signed_at #, :last_name
|
||||||
|
|
||||||
has_attached_file :document, { :styles => { :medium => "300x300>"},
|
has_attached_file :document, { :styles => { :medium => "300x300>"},
|
||||||
:storage => :s3,
|
:storage => :s3,
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<% @contracts.sort_by{|r| [r.last_name] }.each do |contract| %>
|
<% @contracts.sort_by{|r| (r.last_name) || "" }.each do |contract| %>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<% unless contract.document.blank? %>
|
<% unless contract.document.blank? %>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user