diff --git a/app/models/project.rb b/app/models/project.rb index 47494ff31..1b88a4e85 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -59,10 +59,7 @@ class Project < ActiveRecord::Base :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id' - #添加用户关注项目功能 fq - has_many :watchers, :through => :watchers_of_projects, :class_name => 'User' - has_many :watchers_of_projects, :class_name => 'WatchersOfProjects' - #end + has_many :tags, :through => :project_tags, :class_name => 'Tag' has_many :project_tags, :class_name => 'ProjectTags' diff --git a/app/models/user.rb b/app/models/user.rb index 373252e14..c9d0bc998 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -75,20 +75,8 @@ class User < Principal has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'" has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source - - # 添加用户关注项目功能 fq - has_many :projects, :through => :watchers_of_projects - has_many :watchers_of_projects, :class_name => 'WatchersOfProjects' - # end of - - # 添加关注用户功能 fq - has_many :watchers_of_users - # end of - - #添加用户留言功能 fq - has_many :messages_for_users - #end -#####fq + + #####fq has_many :jours, :class_name => 'JournalsForMessage', :dependent => :destroy has_many :bids, :foreign_key => 'author_id', :dependent => :destroy has_many :journals_for_messages, :as => :jour, :dependent => :destroy diff --git a/public/images/button/bg106.jpg b/public/images/button/bg106.jpg new file mode 100644 index 000000000..5db4c7223 Binary files /dev/null and b/public/images/button/bg106.jpg differ diff --git a/public/images/time_member.png b/public/images/time_member.png new file mode 100644 index 000000000..81f91726d Binary files /dev/null and b/public/images/time_member.png differ