Removed first and last name. Using full_name_or_username instead of f…

…ull_name everywhere now
kandanapp · Feb 26, 2013 · b367ccf · b367ccf
1 parent b3fd34d
commit b367ccf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -13,10 +13,7 @@ class User < ActiveRecord::Base
   after_destroy :ensure_at_least_one_admin
 
   validates :username, :presence => true, :uniqueness => true
-  validates :first_name, :presence => true
-  validates :last_name, :presence => true
 
-
   # Kandan.devise_modules is defined in config/initializers/kandan.rb
   devise devise *Kandan.devise_modules
 

diff --git a/app/views/admin/admin/_user_table.html.erb b/app/views/admin/admin/_user_table.html.erb
@@ -13,7 +13,7 @@
 	</thead>
 	<tbody>
 		<% users.each do |user| %>
-			<tr class="<%= cycle('odd', 'even')%>" data-user-id="<%= user.id%>" data-full-name="<%= user.full_name %>">
+			<tr class="<%= cycle('odd', 'even')%>" data-user-id="<%= user.id%>" data-full-name="<%= user.full_name_or_username %>">
 				<td class="username">
 					<%= user.username %>
 				</td>

diff --git a/lib/tasks/kandan.rake b/lib/tasks/kandan.rake
@@ -121,7 +121,7 @@ namespace :kandan do
           user.is_admin = true
           user.save!
 
-          puts "Done. #{user.full_name} is now admin!"
+          puts "Done. #{user.full_name_or_username} is now admin!"
 
           done = true
         else