diff --git a/app/controllers/door_logs_controller.rb b/app/controllers/door_logs_controller.rb index 2eb1e46..345fa72 100644 --- a/app/controllers/door_logs_controller.rb +++ b/app/controllers/door_logs_controller.rb @@ -5,7 +5,7 @@ class DoorLogsController < ApplicationController # GET /door_logs # GET /door_logs.json def index - @door_logs = DoorLog.find(:all, :order => "created_at DESC") + @door_logs = DoorLog.find(:all, :order => "created_at DESC", :limit => 500) respond_to do |format| format.html # index.html.erb diff --git a/app/views/door_logs/index.html.erb b/app/views/door_logs/index.html.erb index 9217962..7578aca 100644 --- a/app/views/door_logs/index.html.erb +++ b/app/views/door_logs/index.html.erb @@ -72,8 +72,8 @@ Guide to log keys and data: end %> <% @cardnum = (door_log.data.to_i+(@divided_tmp*32767)).to_s(16) %> <%= "Card: "+@cardnum %> - <% @card_user = User.find(:first,:conditions=>['card_number LIKE ?', @cardnum]) %> - <%= "("+@card_user.name+")" unless @card_user.nil? %> + <% @card = Card.find(:first,:conditions=>['card_number LIKE ?', @cardnum]) %> + <%= "("+@card.user.name+")" unless @card.nil? %> <% else @divided_tmp = nil diff --git a/db/schema.rb b/db/schema.rb index 5298076..ee0c23d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition.