db/migrate/20090112025756_add_display_name_and_resolved_name_to_users.rb @@ -40,7 +40,7 @@ class MembersController < ApplicationController end @default_sorting = {:order => 'roles_users.created_at', :direction => 'desc'} - paginate_order = current_sorting_options(@default_sorting[:order], @default_sorting[:direction], ['users.login', 'roles_users.created_at', 'users.email']) + paginate_order = current_sorting_options(@default_sorting[:order], @default_sorting[:direction], ['users.resolved_name', 'users.login', 'roles_users.created_at', 'users.email']) # this sets up all instance variables # as well as preparing @members app/controllers/members_controller.rb @@ -96,6 +96,9 @@ class User < ActiveRecord::Base before_save :encrypt_password + # Create the resolved name based on the display name or login + before_save :display_name_or_login + # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def self.authenticate(login, password) # hide records with a nil activated_at @@ -186,14 +189,7 @@ class User < ActiveRecord::Base end def user_name - user_name_field = EXTENDED_FIELD_FOR_USER_NAME - extended_content_hash = self.xml_attributes_without_position - @user_name = self.login - if !extended_content_hash.blank? && !extended_content_hash[user_name_field].blank? && !extended_content_hash[user_name_field]['value'].blank? - # most likely have to pull the other attributes out - @user_name = extended_content_hash[user_name_field]['value'].strip - end - return @user_name + self.resolved_name end def show_email? @@ -290,6 +286,10 @@ class User < ActiveRecord::Base crypted_password.blank? || !password.blank? end + def display_name_or_login + self.resolved_name = (self.display_name || self.login) + end + private # when a user is to be deleted app/models/user.rb @@ -34,7 +34,12 @@ <p> <table class="members-list-table"> <tr valign="top"> - <th colspan="2" abbr="Login" class="member_login"><%= search_sorting_controls_for('User name and/or Login', 'users.login', false) -%></th> + <th colspan="2" abbr="Login" class="member_login"> + <%= search_sorting_controls_for('User name', 'users.resolved_name', false) -%> + <% if @site_admin -%> + or <%= search_sorting_controls_for('Login', 'users.login', false) -%> + <% end -%> + </th> <th abbr="Joined" class="member_joined"><%= search_sorting_controls_for('Joined', 'roles_users.created_at', true, 'desc') -%></th> <% if @site_admin -%> app/views/members/list.rhtml @@ -19,7 +19,8 @@ namespace :kete do 'kete:upgrade:make_baskets_approved_if_status_null', 'zebra:load_initial_records', 'kete:upgrade:update_existing_comments_commentable_private', - 'kete:tools:remove_robots_txt'] + 'kete:tools:remove_robots_txt', + 'kete:upgrade:move_user_name_to_display_and_resolved_name'] namespace :upgrade do desc 'Privacy Controls require that Comment#commentable_private be set. Update existing comments to have this data.' task :update_existing_comments_commentable_private => :environment do @@ -185,6 +186,28 @@ namespace :kete do end end + desc 'Transfer the old user names in the extended content fields into the display/resolved name fields on the users table, and remove the user name field mapping for Users' + task :move_user_name_to_display_and_resolved_name => :environment do + User.all.each do |user| + unless user.display_name.nil? + user_name_field = EXTENDED_FIELD_FOR_USER_NAME + extended_content_hash = user.xml_attributes_without_position + if !extended_content_hash.blank? && !extended_content_hash[user_name_field].blank? && !extended_content_hash[user_name_field]['value'].blank? + user.display_name = extended_content_hash[user_name_field]['value'].strip + extended_content_hash = extended_content_hash.delete(user_name_field) + user.extended_content_values = extended_content_hash + end + end + user.resolved_name = user.login # this will get rewritten using an before save callback on the User model + user.save! + end + # finally, lets removing the user name field mapping to prevent new user names from being set + content_type_id = ContentType.find_by_class_name('User').id + extended_field_id = ExtendedField.find_by_label('User Name').id + content_mapping = ContentTypeToFieldMapping.find_by_content_type_id_and_extended_field_id(content_type_id, extended_field_id) + content_mapping.destroy unless content_mapping.nil? + end + desc 'Checks for mimetypes an adds them if needed.' task :add_missing_mime_types => ['kete:upgrade:add_octet_stream_and_word_types', 'kete:upgrade:add_aiff_to_audio_recordings', lib/tasks/upgrade.rake db/bootstrap/content_type_to_field_mappings.yml f9e9103c906792b8b78ae6d14a1942dea1ff68ef Kieran Pilkington kieran@katipo.co.nz http://github.com/kete/kete/commit/143b8c33afc2d32c696991e2f018317b689a94cc 143b8c33afc2d32c696991e2f018317b689a94cc 2009-01-11T20:30:04-08:00 2009-01-11T20:30:04-08:00 refinement: moving the user_name from extended fields to display_name and resolved_name on the Users table, adding a rake task to migrate them, delete them from the users extended content, and remove the content mapping. And allow sorting by resolved name and login on a basket member list. Removing the bootstrapped content mapping as well. 3ebaec9781f15664814ae7259e7b173e7e7d212c Kieran Pilkington kieran@katipo.co.nz