developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-05-17 10:00:07 +08:00
parent bfad553cc3 4467bc5e48
commit 1e2b146c21
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/uploaders/file_asset.rb → app/uploaders/file_asset_uploader.rb
View File

4
vendor/built_in_modules/announcement/app/models/bulletin.rb vendored
View File

@ -13,8 +13,8 @@ class Bulletin
has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
has_and_belongs_to_many :tags, :class_name => "AnnouncementTag" has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
field :postdate , :type => Date field :postdate , :type => DateTime
field :deadline , :type => Date field :deadline , :type => DateTime
# field :url # field :url
field :create_user_id field :create_user_id
field :update_user_id, :class_name => "User" field :update_user_id, :class_name => "User"

4
vendor/built_in_modules/news/app/models/news_bulletin.rb vendored
View File

@ -13,8 +13,8 @@ class NewsBulletin
has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
has_and_belongs_to_many :tags, :class_name => "NewsTag" has_and_belongs_to_many :tags, :class_name => "NewsTag"
field :postdate , :type => Date field :postdate , :type => DateTime
field :deadline , :type => Date field :deadline , :type => DateTime
# field :url # field :url
field :create_user_id field :create_user_id
field :update_user_id, :class_name => "User" field :update_user_id, :class_name => "User"