enju_leaf 1.1.0.rc16 → 1.1.0.rc17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39450aed8ab4e4e97cf12f78408cbda1141aa118
-  data.tar.gz: f5b50dc4938bb00e16a9e998e0d58c387984f34b
+  metadata.gz: a8d14bdad46e9c610c2389ca04b54bc526cd3877
+  data.tar.gz: b6cd6d4d8be8126685adcd08586fb5830d621a77
 SHA512:
-  metadata.gz: db43ab43a91a071fe6fc284e07878be2197ea5f629016c78eafc84d91d6b7b2bdf2197cfe0b6b0bb14f39ce2c07f4aac3f87d615cec7f48048c6f7b07cb7f9f8
-  data.tar.gz: d217264a96f8976dcb0c746b22d33f3e1d8054b82137a7a51afdb01662d6de8d67d1d02d593f4ff4c3571e37b7c3c05cd0b06beab0749da2c0a3215d9963c870
+  metadata.gz: 4a40ca67ed8ac850e90aac0ba18e48b1b9985e47e4f65e453b8b794bd45a5b723e436e0da2d194863845a7bd66c0d48eedbd8e35f1321aedbb04c02faa20c46f
+  data.tar.gz: 729bdbf4a9d147afa295ebac0abc997f7a129ebd7088c3681de30b9465481d65af9a126bdb3228d51216109651caae1c95e60455d7e8c5ab52f93593fca4e029

data/README.rdoc

@@ -1,5 +1,5 @@
 = Next-L Enju Leaf
-{<img src="https://travis-ci.org/next-l/enju_leaf.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
+{<img src="https://travis-ci.org/next-l/enju_leaf.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
 {<img src="https://coveralls.io/repos/next-l/enju_leaf/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_leaf?branch=1.1]
 {<img src="https://hakiri.io/github/next-l/enju_leaf/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_leaf/1.1]
 

data/app/assets/javascripts/mobile.js

@@ -1,4 +1,4 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery.mobile-1.4.4
+//= require jquery.mobile-1.4.5
 //= require jquery.colorbox

data/app/assets/stylesheets/enju.css

@@ -475,7 +475,7 @@ div#flash_notice{
 }
 
 td#edit_icons, th#edit_icons{
-  width: 50px;
+  width: 100px;
   line-height: 200%;
 }
 

data/app/assets/stylesheets/mobile.css

@@ -3,6 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require jquery.mobile-1.4.4
+ *= require jquery.mobile-1.4.5
  *= require enju_mobile
 */

data/app/controllers/my_accounts_controller.rb

@@ -28,15 +28,18 @@ class MyAccountsController < ApplicationController
 
   def update
     @profile = current_user.profile
+    user_attrs = [
+      :id, :email, :current_password, :password, :password_confirmation
+    ]
+    user_attrs += [
+      {:user_has_role_attributes => [:id, :role_id]}
+    ] if current_user.has_role?('Administrator')
+
+    user_params = ActionController::Parameters.new(params[:profile][:user_attributes]).permit(*user_attrs)
 
     respond_to do |format|
-      if current_user.has_role?('Librarian')
-        saved = current_user.update_with_password(params[:profile][:user_attributes], as: :admin)
-        @profile.assign_attributes(params[:profile], as: :admin)
-      else
-        saved = current_user.update_with_password(params[:profile][:user_attributes])
-        @profile.assign_attributes(params[:profile])
-      end
+      saved = current_user.update_with_password(user_params)
+      @profile.assign_attributes(profile_params)
 
       if saved
         if @profile.save
@@ -49,7 +52,9 @@ class MyAccountsController < ApplicationController
           format.json { render json: current_user.errors, status: :unprocessable_entity }
         end
       else
-        @profile.errors[:base] << I18n.t('activerecord.attributes.user.current_password')
+        current_user.errors.full_messages.each do |msg|
+          @profile.errors[:base] << msg
+        end
         prepare_options
         format.html { render action: "edit" }
         format.json { render json: current_user.errors, status: :unprocessable_entity }
@@ -68,6 +73,21 @@ class MyAccountsController < ApplicationController
   end
 
   private
+  def profile_params
+    attrs = [
+      :full_name, :full_name_transcription, :user_number,
+      :library_id, :keyword_list, :note,
+      :locale, :required_role_id, :expired_at,
+      :locked, :birth_date,
+      :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
+      :save_search_history # EnjuSearchLog
+    ]
+    if current_user.has_role?('Librarian')
+      attrs << :user_group_id
+    end
+    params.require(:profile).permit(*attrs)
+  end
+
   def prepare_options
     @user_groups = UserGroup.order(:position)
     @roles = Role.order(:position)

data/app/controllers/profiles_controller.rb

@@ -76,26 +76,29 @@ class ProfilesController < ApplicationController
       redirect_to edit_my_account_url
       return
     end
+    if @profile.user.try(:locked_at?)
+      @profile.user.locked = true
+    end
   end
 
   # POST /profiles
   # POST /profiles.json
   def create
     if current_user.has_role?('Librarian')
-      @profile = Profile.new(params[:profile], as: :admin)
+      @profile = Profile.new(profile_params)
       if @profile.user
         @profile.user.operator = current_user
-        @profile.user.set_auto_generated_password
+        password = @profile.user.set_auto_generated_password
       end
     else
-      @profile = Profile.new(params[:profile])
+      @profile = Profile.new(profile_params)
     end
 
     respond_to do |format|
       if @profile.save
         if @profile.user
           @profile.user.role = Role.where(name: 'User').first
-          flash[:temporary_password] = @profile.user.password
+          flash[:temporary_password] = password
         end
         format.html { redirect_to @profile, notice: t('controller.successfully_created', model: t('activerecord.models.profile')) }
         format.json { render json: @profile, status: :created, location: @profile }
@@ -110,20 +113,16 @@ class ProfilesController < ApplicationController
   # PUT /profiles/1
   # PUT /profiles/1.json
   def update
-    if current_user.has_role?('Librarian')
-      @profile.update_attributes(params[:profile], as: :admin)
-    else
-      @profile.update_attributes(params[:profile])
-    end
+    @profile.update_attributes(profile_update_params)
     if @profile.user
       if @profile.user.auto_generated_password == "1"
-        @profile.user.set_auto_generated_password
-        flash[:temporary_password] = @profile.user.password
+        password = @profile.user.set_auto_generated_password
       end
     end
 
     respond_to do |format|
       if @profile.save
+        flash[:temporary_password] = password
         format.html { redirect_to @profile, notice: t('controller.successfully_updated', model: t('activerecord.models.profile')) }
         format.json { head :no_content }
       else
@@ -146,6 +145,44 @@ class ProfilesController < ApplicationController
   end
 
   private
+  def profile_params
+    attrs = [
+      :full_name, :full_name_transcription,
+      :keyword_list, :locale,
+      :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
+      :save_search_history, # EnjuSearchLog
+    ]
+    attrs += [
+      :library_id, :expired_at, :birth_date,
+      :user_group_id, :required_role_id, :note, :locked, :user_number, {
+        :user_attributes => [
+          :id, :username, :email, :current_password,
+          {:user_has_role_attributes => [:id, :role_id]}
+        ]
+      }
+    ] if current_user.has_role?('Librarian')
+    params.require(:profile).permit(*attrs)
+  end
+
+  def profile_update_params
+    attrs = [
+      :full_name, :full_name_transcription,
+      :keyword_list, :locale,
+      :save_checkout_history, # EnjuCirculation
+      :save_search_history, # EnjuSearchLog
+    ]
+    attrs += [
+      :library_id, :expired_at, :birth_date,
+      :user_group_id, :required_role_id, :note, :locked, :user_number, {
+        :user_attributes => [
+          :id, :email, :current_password, :auto_generated_password,
+          {:user_has_role_attributes => [:id, :role_id]}
+        ]
+      }
+    ] if current_user.has_role?('Librarian')
+    params.require(:profile).permit(*attrs)
+  end
+
   def prepare_options
     @user_groups = UserGroup.all
     @roles = Role.all

data/app/controllers/roles_controller.rb

@@ -32,7 +32,7 @@ class RolesController < ApplicationController
     end
 
     respond_to do |format|
-      if @role.update_attributes(params[:role])
+      if @role.update_attributes(role_params)
         format.html { redirect_to @role, notice: t('controller.successfully_updated', model: t('activerecord.models.role')) }
         format.json { head :no_content }
       else
@@ -41,4 +41,9 @@ class RolesController < ApplicationController
       end
     end
   end
+
+  private
+  def role_params
+    params.require(:role).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/user_export_files_controller.rb

@@ -53,7 +53,7 @@ class UserExportFilesController < ApplicationController
   # POST /user_export_files
   # POST /user_export_files.json
   def create
-    @user_export_file = UserExportFile.new(params[:user_export_file])
+    @user_export_file = UserExportFile.new(user_export_file_params)
     @user_export_file.user = current_user
 
     respond_to do |format|
@@ -74,7 +74,7 @@ class UserExportFilesController < ApplicationController
   # PUT /user_export_files/1.json
   def update
     respond_to do |format|
-      if @user_export_file.update_attributes(params[:user_export_file])
+      if @user_export_file.update_attributes(user_export_file_params)
         if @user_export_file.mode == 'export'
           UserExportFileQueue.perform(@user_export_file.id)
         end
@@ -97,4 +97,9 @@ class UserExportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def user_export_file_params
+    params.require(:user_export_file).permit(:mode)
+  end
 end

data/app/controllers/user_groups_controller.rb

@@ -40,7 +40,7 @@ class UserGroupsController < ApplicationController
   # POST /user_groups
   # POST /user_groups.json
   def create
-    @user_group = UserGroup.new(params[:user_group])
+    @user_group = UserGroup.new(user_group_params)
 
     respond_to do |format|
       if @user_group.save
@@ -63,7 +63,7 @@ class UserGroupsController < ApplicationController
     end
 
     respond_to do |format|
-      if @user_group.update_attributes(params[:user_group])
+      if @user_group.update_attributes(user_group_params)
         format.html { redirect_to @user_group, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group')) }
         format.json { head :no_content }
       else
@@ -86,6 +86,17 @@ class UserGroupsController < ApplicationController
   end
 
   private
+  def user_group_params
+    params.require(:user_group).permit(
+      :name, :display_name, :note, :valid_period_for_new_user,
+      :expired_at, :number_of_day_to_notify_overdue,
+      :number_of_day_to_notify_overdue,
+      :number_of_day_to_notify_due_date,
+      :number_of_time_to_notify_overdue,
+      :user_group_has_checkout_types_attributes # EnjuCirculation
+    )
+  end
+
   def prepare_options
     if defined?(EnjuCirculation)
       @checkout_types = CheckoutType.select([:id, :display_name, :position])

data/app/controllers/user_import_files_controller.rb

@@ -55,7 +55,7 @@ class UserImportFilesController < ApplicationController
   # POST /user_import_files
   # POST /user_import_files.json
   def create
-    @user_import_file = UserImportFile.new(params[:user_import_file])
+    @user_import_file = UserImportFile.new(user_import_file_params)
     @user_import_file.user = current_user
 
     respond_to do |format|
@@ -77,7 +77,7 @@ class UserImportFilesController < ApplicationController
   # PUT /user_import_files/1.json
   def update
     respond_to do |format|
-      if @user_import_file.update_attributes(params[:user_import_file])
+      if @user_import_file.update_attributes(user_import_file_params)
         if @user_import_file.mode == 'import'
           Resque.enqueue(UserImportFileQueue, @user_import_file.id)
         end
@@ -103,6 +103,13 @@ class UserImportFilesController < ApplicationController
   end
 
   private
+  def user_import_file_params
+    params.require(:user_import_file).permit(
+      :user_import, :edit_mode, :user_encoding, :mode,
+      :default_user_group_id, :default_library_id
+    )
+  end
+
   def prepare_options
     @user_groups = UserGroup.all
     @libraries = Library.all

data/app/controllers/user_import_results_controller.rb

@@ -37,4 +37,11 @@ class UserImportResultsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def user_import_result_params
+    params.require(:user_import_result).permit(
+      :user_import_file_id, :user_id, :body
+    )
+  end
 end

data/app/models/profile.rb

@@ -1,18 +1,10 @@
 class Profile < ActiveRecord::Base
-  attr_accessible :full_name, :full_name_transcription, :keyword_list, :locale
-  attr_accessible :full_name, :full_name_transcription, :user_number,
-    :library_id, :keyword_list, :note,
-    :user_group_id, :user_id, :locale, :required_role_id, :expired_at,
-    :user_attributes,
-    :save_checkout_history, :birth_date,
-    as: :admin
-
   enju_circulation_profile_model if defined?(EnjuCirculation)
   enju_search_log_profile_model if defined?(EnjuSearchLog)
 
   scope :administrators, -> { joins(user: :role).where('roles.name = ?', 'Administrator') }
   scope :librarians, -> { joins(user: :role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
-  belongs_to :user
+  belongs_to :user, dependent: :destroy
   belongs_to :library, validate: true
   belongs_to :user_group
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' #, validate: true
@@ -23,7 +15,7 @@ class Profile < ActiveRecord::Base
   validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\Z/ }, allow_blank: true
   validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\Z/ }, allow_blank: true
 
-  attr_accessor :birth_date
+  attr_accessor :birth_date, :locked
 
   searchable do
     text :user_number, :full_name, :full_name_transcription, :note
@@ -52,7 +44,7 @@ class Profile < ActiveRecord::Base
   accepts_nested_attributes_for :user
 
   def set_role_and_agent
-    self.required_role = Role.where(name: 'Librarian').first
+    self.required_role = Role.where(name: 'Librarian').first unless required_role
     self.locale = I18n.default_locale.to_s unless locale
   end
 

data/app/models/role.rb

@@ -1,5 +1,4 @@
 class Role < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order("roles.position") }
   validates :name, presence: true, format: { with: /\A[A-Za-z][a-z_,]*[a-z]\Z/ }

data/app/models/user_export_file.rb

@@ -1,9 +1,15 @@
 class UserExportFile < ActiveRecord::Base
-  attr_accessible
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
   enju_export_file_model
-  has_attached_file :user_export
+  if Setting.uploaded_file.storage == :s3
+    has_attached_file :user_export, storage: :s3,
+      s3_credentials: Setting.amazon,
+      s3_permissions: :private
+  else
+    has_attached_file :user_export,
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
   validates_attachment_content_type :user_export, content_type: /\Atext\/plain\Z/
 
   has_many :user_export_file_transitions
@@ -35,6 +41,10 @@ class UserExportFile < ActiveRecord::Base
   def self.transition_class
     UserExportFileTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/user_export_file_transition.rb

@@ -3,7 +3,7 @@ class UserExportFileTransition < ActiveRecord::Base
 
   
   belongs_to :user_export_file, inverse_of: :user_export_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/user_group.rb

@@ -1,11 +1,5 @@
 # -*- encoding: utf-8 -*-
 class UserGroup < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :valid_period_for_new_user,
-    :expired_at, :number_of_day_to_notify_overdue,
-    :number_of_day_to_notify_overdue,
-    :number_of_day_to_notify_due_date,
-    :number_of_time_to_notify_overdue
-
   include MasterModel
   default_scope { order("user_groups.position") }
   has_many :profiles

data/app/models/user_has_role.rb

@@ -1,6 +1,4 @@
 class UserHasRole < ActiveRecord::Base
-  attr_accessible :user_id, :role_id, :role
-  attr_accessible :user_id, :role_id, :role, as: :admin
   belongs_to :user
   belongs_to :role
   accepts_nested_attributes_for :role

data/app/models/user_import_file.rb

@@ -1,7 +1,5 @@
 class UserImportFile < ActiveRecord::Base
-  attr_accessible :user_import, :edit_mode, :user_encoding, :mode,
-    :default_user_group_id, :default_library_id
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
   default_scope {order('user_import_files.id DESC')}
   scope :not_imported, -> { in_state(:pending) }
@@ -9,7 +7,7 @@ class UserImportFile < ActiveRecord::Base
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :user_import, storage: :s3,
-      s3_credentials: "#{Setting.amazon}",
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :user_import,
@@ -77,11 +75,14 @@ class UserImportFile < ActiveRecord::Base
         end
         new_user.operator = user
         new_user.username = username
-        new_user.assign_attributes(set_user_params(new_user, row), as: :admin)
+        new_user.assign_attributes(set_user_params(new_user, row))
         profile = Profile.new
-        profile.assign_attributes(set_profile_params(row), as: :admin)
+        profile.assign_attributes(set_profile_params(row))
 
         if new_user.save
+          if profile.locked
+            new_user.lock_access!
+          end
           new_user.profile = profile
           if profile.save
             num[:user_imported] += 1
@@ -167,7 +168,12 @@ class UserImportFile < ActiveRecord::Base
       row_num += 1
       username = row['username'].to_s.strip
       user = User.where(username: username).first
-      user.destroy if user
+      if user
+        UserImportFile.transaction do
+          user.profile.destroy
+          user.destroy
+        end
+      end
     end
     transition_to!(:completed)
   rescue => e
@@ -182,10 +188,15 @@ class UserImportFile < ActiveRecord::Base
     UserImportFileTransition
   end
 
+  def self.initial_state
+    :pending
+  end
+
   def open_import_file(tempfile)
     file = CSV.open(tempfile.path, 'r:utf-8', col_sep: "\t")
     header_columns = %w(
       username role email password user_group user_number expired_at
+      full_name full_name_transcription required_role locked
       keyword_list note locale library dummy
     )
     if defined?(EnjuCirculation)
@@ -240,18 +251,30 @@ class UserImportFile < ActiveRecord::Base
     end
     params[:user_group_id] = user_group.id if user_group
 
+    required_role = Role.where(name: row['required_role']).first
+    unless required_role
+      required_role = Role.where(name: 'Librarian').first
+    end
+    params[:required_role_id] = required_role.id if required_role
+
     params[:user_number] = row['user_number']
+    params[:full_name] = row['full_name']
+    params[:full_name_transcription] = row['full_name_transcription']
 
     if row['expired_at'].present?
       params[:expired_at] = Time.zone.parse(row['expired_at']).end_of_day
     end
 
     if row['keyword_list'].present?
-      params[:keyword_list] = row['keyword_list'].split('//').join('\n')
+      params[:keyword_list] = row['keyword_list'].split('//').join("\n")
     end
 
     params[:note] = row['note']
 
+    if %w(t true).include?(row['locked'].to_s.downcase.strip)
+      params[:locked] = true 
+    end
+
     if I18n.available_locales.include?(row['locale'].to_s.to_sym)
       params[:locale] = row['locale']
     end

data/app/models/user_import_file_transition.rb

@@ -3,7 +3,7 @@ class UserImportFileTransition < ActiveRecord::Base
 
   
   belongs_to :user_import_file, inverse_of: :user_import_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/user_import_result.rb

@@ -1,5 +1,4 @@
 class UserImportResult < ActiveRecord::Base
-  attr_accessible :user_import_file_id, :user_id, :body
   default_scope { order('user_import_results.id') }
   scope :file_id, proc{ |file_id| where(user_import_file_id: file_id) }
   scope :failed, -> { where(user_id: nil) }

data/app/views/my_accounts/show.html.erb

@@ -13,33 +13,11 @@
   <% if defined?(EnjuCirculation) %>
     <h2>
       <%= t('activerecord.models.checkout') %>
-      <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_url(icalendar_token: current_user.checkout_icalendar_token, format: :ics) if current_user.checkout_icalendar_token? %>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_url(user_id: current_user.username, format: :rss) %>
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_url(user_id: current_user.username, format: :txt) %>
+      <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(icalendar_token: current_user.profile.checkout_icalendar_token, format: :ics) if current_user.profile.checkout_icalendar_token? %>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: current_user.username, format: :rss) %>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: current_user.username, format: :txt) %>
     </h2>
-    <table class="table table-striped index">
-      <tr>
-        <th><%= t('activerecord.models.item') %></th>
-        <th><%= t('activerecord.attributes.checkout.due_date') %></th>
-      </tr>
-      <% current_user.checkouts.not_returned.each do |checkout| %>
-        <tr class="line<%= cycle("0", "1") -%>">
-          <td>
-            <%= link_to checkout.item.item_identifier, checkout.item %><br />
-            (<%= link_to checkout.item.manifestation.original_title, checkout.item.manifestation %>)
-          </td>
-          <td>
-            <%=l checkout.due_date, formats: :only_date %>
-            <br />
-            <%- if can? :update, checkout -%>
-              <% unless checkout.checkin %>
-                (<%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>)
-              <% end %>
-            <%- end -%>
-          </td>
-        </tr>
-      <% end %>
-    </table>
+    <%= render 'checkouts/list', checkouts: current_user.checkouts.page(params[:page]) %>
   <% end %>
 </div>
 </div>

data/app/views/page/export.html.erb

@@ -3,6 +3,11 @@
 <div id="content_list">
 
 <ul>
+  <% if current_user.try(:has_role?, 'Administrator') %>
+    <li>
+      <%= link_to t('activerecord.models.user_export_file'), user_export_files_path -%>
+    </li>
+  <% end %>
   <li>
     <%= link_to t('activerecord.models.resource_export_file'), resource_export_files_path -%>
   </li>
@@ -11,11 +16,6 @@
       <%= link_to t('activerecord.models.event_export_file'), event_export_files_path -%>
     </li>
   <% end %>
-  <% if current_user.try(:has_role?, 'Administrator') %>
-    <li>
-      <%= link_to t('activerecord.models.user_export_file'), user_export_files_path -%>
-    </li>
-  <% end %>
 </ul>
 </div>
 </div>

data/app/views/profiles/index.html.erb

@@ -30,7 +30,7 @@
 <%- @profiles.each_with_index do |profile, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <% if profile.user_number %>
+      <% if profile.user_number? %>
         <%= link_to profile.user_number, profile -%>
       <% else %>
         <%= link_to t('profile.no_number'), profile -%>
@@ -38,6 +38,8 @@
     </td>
     <td>
       <%= profile.user.try(:username) -%>
+      <br />
+      <%= profile.full_name %>
     </td>
     <td><%= l(profile.created_at) -%></td>
     <td>