From b4c04d13d2e7891fccac786e004e0c5d66927917 Mon Sep 17 00:00:00 2001 From: Iceskysl Date: Sat, 12 Oct 2013 11:53:43 +0800 Subject: [PATCH] remove the chinese --- app/controllers/holidays_controller.rb | 1 + db/migrate/001_create_holidays.rb | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/holidays_controller.rb b/app/controllers/holidays_controller.rb index d8da41d..c008b2d 100644 --- a/app/controllers/holidays_controller.rb +++ b/app/controllers/holidays_controller.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 class HolidaysController < ApplicationController model_object Holiday unloadable diff --git a/db/migrate/001_create_holidays.rb b/db/migrate/001_create_holidays.rb index 6e61a49..1ec9253 100644 --- a/db/migrate/001_create_holidays.rb +++ b/db/migrate/001_create_holidays.rb @@ -1,8 +1,9 @@ +#encoding: utf-8 class CreateHolidays < ActiveRecord::Migration def change create_table :holidays do |t| - t.integer :typee, :default => 1 #0系统；1个人； - t.integer :user_id #当typee=0的时候，user_id也=0 + t.integer :typee, :default => 1 #0-system；1-user； + t.integer :user_id #when typee=0 ，then user_id=0 t.date :start_date t.date :due_date t.time :start_time @@ -10,7 +11,7 @@ def change t.text :mark t.text :remark - t.integer :status, :default => 0 #0-申请,1-同意 + t.integer :status, :default => 0 #0-init,1-agree t.timestamp :created_at end