will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'csv'

Browse Source 
Conflicts:
	app/models/user_certification.rb
	app/views/user_certifications/index.html.erb
	app/views/user_certifications/show.html.erb
This commit is contained in:
Will Bradley
2013-08-28 08:21:28 -07:00
parent a1ef8a5fd5 25c0d1e1cb
commit accec4edb1
61 changed files with 1026 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/user_certifications/_form.html.erb
View File

@@ -11,13 +11,14 @@
</div>
<% end %>
<% @user_certification.user_id = params[:user] if params[:user].present? %>
<div class="field">
<%= f.label :user_id, "User" %><br />
<%= collection_select(:user_certification, :user_id, @users, :id, :name) %>
<%= collection_select(:user_certification, :user_id, @users, :id, :name, :include_blank => true) %>
</div>
<div class="field">
<%= f.label :certification_id, "Certification" %><br />
<%= collection_select(:user_certification, :certification_id, @certifications, :id, :name) %>
<%= collection_select(:user_certification, :certification_id, @certifications, :id, :name, :include_blank => true) %>
</div>
<div class="actions">
<%= f.submit %>

2
app/views/user_certifications/index.html.erb
View File

@@ -7,7 +7,7 @@
<dt><%= cert.name %></dt>
<% user_certifications.sort{|a,b| a.user_name <=> b.user_name}.each do |user_certification| %>
<dd>
<%= link_to user_certification.user_name, user_certification %>
<%= link_to user_certification.user_name, user_certification %>
</dd>
<% end %>
</dl>

2
app/views/user_certifications/show.html.erb
View File

@@ -1,6 +1,6 @@
<p>
<b>User:</b>
<%= @user_certification.user_name %>
<%= link_to @user_certification.user.name, @user_certification.user %>
</p>
<p>