Skip to content

Commit

Permalink
remove the chinese
Browse files Browse the repository at this point in the history
  • Loading branch information
IceskYsl committed Oct 12, 2013
1 parent d4afc58 commit b4c04d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions app/controllers/holidays_controller.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class HolidaysController < ApplicationController
model_object Holiday
unloadable
Expand Down
7 changes: 4 additions & 3 deletions db/migrate/001_create_holidays.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
#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
t.time :due_time

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
Expand Down

0 comments on commit b4c04d1

Please sign in to comment.