user und fetprofile link

This commit is contained in:
Andreas Stephanides
2013-12-16 10:27:15 +01:00
parent e57a3290cf
commit 56f32606dc
5 changed files with 60 additions and 28 deletions

View File

@@ -12,6 +12,17 @@ class UsersController < ApplicationController
end end
redirect_to users_url redirect_to users_url
end end
def all_update
params[:users].each do |id,u|
user=User.find(id)
user.fetprofile = Fetprofile.find(u[:fetprofile_id].to_i) if u[:fetprofile_id].to_i>0
user.save if can? :edit, User
end
redirect_to users_url
end
def do_confirm def do_confirm
@user= User.find(params[:id]) @user= User.find(params[:id])
@user.confirm! @user.confirm!

View File

@@ -23,9 +23,9 @@ class Fetprofile < ActiveRecord::Base
validates :desc, :presence=>true validates :desc, :presence=>true
validates :nachname, length:{minimum: 3},:presence=>true validates :nachname, length:{minimum: 3},:presence=>true
validates :vorname, length:{minimum: 3},:presence=>true validates :vorname, length:{minimum: 3},:presence=>true
has_many :users
accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}, :allow_destroy=>true
accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}
def name def name
[vorname, nachname, ((short.empty?)? "": ["(",short,")"].join)].join(" ") [vorname, nachname, ((short.empty?)? "": ["(",short,")"].join)].join(" ")

View File

@@ -33,6 +33,7 @@ class User < ActiveRecord::Base
# Setup accessible (or protected) attributes for your model # Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
belongs_to :fetprofile
# attr_accessible :title, :body # attr_accessible :title, :body
def self.find_for_facebook_oauth(auth, signed_in_resource=nil) def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
logger.debug auth.to_s logger.debug auth.to_s
@@ -79,5 +80,11 @@ logger.debug auth.to_s
end end
end end
end end
def text
if self.fetprofile.nil?
self.email
else
self.fetprofile.name
end
end
end end

View File

@@ -6,7 +6,7 @@
</span> </span>
<span class="pull-right"> <span class="pull-right">
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %> <%= @neuigkeit.author.text+ " am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
</span> </span>
<div class="media"> <div class="media">
<div class="pull-left" href="#"> <div class="pull-left" href="#">

View File

@@ -3,19 +3,22 @@
<%= link_to "Admin" , :controller =>"config" , :action => "index"%> <%= link_to "Admin" , :controller =>"config" , :action => "index"%>
</li> </li>
</ul> </ul>
<%= semantic_form_for "users[]", :url=>all_update_users_path do |ff|%>
<table class="table table-striped"> <table class="table table-striped">
<tr><th>E-Mail</th><th>Rollen</th><th>Actions</th> <tr><th>E-Mail</th><th>Rollen</th><th>Actions</th><th>Profile</th>
</tr> </tr>
<% @users.each do |user|%> <% @users.each do |user|%>
<tr>
<td>
<%= user.email %></td><td><ul>
<% user.roles.each do |role| %>
<li><%= role.name%></li>
<% end %></ul></td>
<td>
<tr>
<td><%= user.email %></td>
<td>
<ul>
<% user.roles.each do |role| %><li><%= role.name%></li><% end %>
</ul>
</td>
<td>
<div class="btn-group"> <div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
Action Action
@@ -24,10 +27,21 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><%= link_to 'Rolle: fetadmin', user_add_role_path(user, "fetadmin")%></li> <li><%= link_to 'Rolle: fetadmin', user_add_role_path(user, "fetadmin")%></li>
<li><%= link_to 'Rolle: fetuser', user_add_role_path(user, "fetuser")%></li> <li><%= link_to 'Rolle: fetuser', user_add_role_path(user, "fetuser")%></li>
<!-- dropdown menu links --> <!-- dropdown menu links -->
</ul> </ul>
</div> </div>
</td> </td>
</tr><% end %> <td>
<%= semantic_fields_for "users[#{user.id}]", user do |f|%>
<%= f.input :fetprofile ,:label=>false , :as=>:select , :collection=>Fetprofile.all %>
<% end %>
</td>
</tr>
<% end %>
</table> </table>
<%= ff.actions do %>
<%= ff.action :submit, :as => :button %>
<%= ff.action :cancel, :as => :link %>
<% end %>
<% end %>