diff --git a/app/models/open_source_project.rb b/app/models/open_source_project.rb index 114a95cc4..95b4444e1 100644 --- a/app/models/open_source_project.rb +++ b/app/models/open_source_project.rb @@ -1,5 +1,5 @@ class OpenSourceProject < ActiveRecord::Base - attr_accessible :String + attr_accessible :name include Redmine::SafeAttributes has_many :applies, :class_name => "ApplyProjectMaster", :as => :apply, :dependent => :delete_all @@ -12,6 +12,7 @@ class OpenSourceProject < ActiveRecord::Base has_many :apply_tips, :class_name => 'ApplyProjectMaster', :as => :apply, :dependent => :delete_all, :conditions => "#{ApplyProjectMaster.table_name}.status = 1" has_many :applicants, :class_name => 'User', :through => :apply_tips, :source => :user + validates_uniqueness_of :name acts_as_taggable @@ -41,7 +42,7 @@ class OpenSourceProject < ActiveRecord::Base } scope :filter_time, lambda {|args| - nil + where("YEAR(#{OpenSourceProject.table_name}.created_at) = ?", args) unless args.nil? } # def filter_app_dir(app_dir) diff --git a/app/views/open_source_projects/_os_project.html.erb b/app/views/open_source_projects/_os_project.html.erb index 937fd3b1b..cae5b963b 100644 --- a/app/views/open_source_projects/_os_project.html.erb +++ b/app/views/open_source_projects/_os_project.html.erb @@ -57,12 +57,12 @@ <%= content_tag('span', "项目来源：")%><%= link_to project.url, project.url %>
- <%= content_tag('span', "数据更新时间") %><%= content_tag('span', format_time(project.created_at)) %> + <%= content_tag('span', "数据更新时间:") %><%= content_tag('span', project.date_collected) %>
<%= image_tag( "/images/sidebar/tags.png") %> - <%= render :partial => 'tags/tag_name', :locals => {:obj => project,:object_flag => "2",:non_list_all => true }%> + <%= render :partial => 'tags/tag_name', :locals => {:obj => project,:object_flag => "7",:non_list_all => true }%>
diff --git a/app/views/open_source_projects/index.html.erb b/app/views/open_source_projects/index.html.erb index 61d4aa60c..e83417dbb 100644 --- a/app/views/open_source_projects/index.html.erb +++ b/app/views/open_source_projects/index.html.erb @@ -2,7 +2,7 @@ <%= form_tag(:controller => 'open_source_projects', :action => "search", :method => :get) do %> - + - - + +
<%= l(:label_project_deposit) %>开源项目社区 <%= l(:label_user_location) %> : @@ -13,8 +13,8 @@
<%= link_to request.host()+"/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> <%= link_to l(:field_homepage), home_path %> > <%= link_to l(:label_project_deposit), :controller => 'projects', :action => 'index', :project_type => 0 %><%= link_to request.host()+"/open_source_projects", :controller => 'open_source_projects', :action => 'index' %> <%= link_to l(:field_homepage), home_path %> > <%= link_to "开源项目社区", :controller => 'open_source_projects', :action => 'index' %>
<% end %> @@ -179,13 +179,14 @@ li { <%= link_to "C", open_source_projects_path(:language => "c", :app_dir => @app_dir, :created_at => @created_at), :class => "nav-more J_More show" %> <%= link_to "C#", open_source_projects_path(:language => "c#", :app_dir => @app_dir, :created_at => @created_at), :class => "nav-more J_More show" %> <%= link_to "ruby", open_source_projects_path(:language => "ruby", :app_dir => @app_dir, :created_at => @created_at), :class => "nav-more J_More show" %> - <%= link_to "其他", open_source_projects_path(:language => "其他", :app_dir => @app_dir, :created_at => @created_at), :class => "nav-more J_More show" %> + <%#= link_to "其他", open_source_projects_path(:language => "其他", :app_dir => @app_dir, :created_at => @created_at), :class => "nav-more J_More show" %>

创立时间：

+ <%= link_to "2014", open_source_projects_path(:app_dir => @app_dir, :language => @language, :created_at => "2014"), :class => "nav-more J_More show" %> <%= link_to "2013", open_source_projects_path(:app_dir => @app_dir, :language => @language, :created_at => "2013"), :class => "nav-more J_More show" %> <%= link_to "2012", open_source_projects_path(:app_dir => @app_dir, :language => @language, :created_at => "2012"), :class => "nav-more J_More show" %> <%= link_to "2011", open_source_projects_path(:app_dir => @app_dir, :language => @language, :created_at => "2011"), :class => "nav-more J_More show" %> diff --git a/db/migrate/20140411011700_change_description_type_to_open_source_project.rb b/db/migrate/20140411011700_change_description_type_to_open_source_project.rb new file mode 100644 index 000000000..8c8804d8a --- /dev/null +++ b/db/migrate/20140411011700_change_description_type_to_open_source_project.rb @@ -0,0 +1,9 @@ +class ChangeDescriptionTypeToOpenSourceProject < ActiveRecord::Migration + def up + change_column :open_source_projects, :description, :text + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/schema.rb b/db/schema.rb index f0969c398..4158b4d85 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140404031622) do +ActiveRecord::Schema.define(:version => 20140411011700) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -679,15 +679,15 @@ ActiveRecord::Schema.define(:version => 20140404031622) do create_table "open_source_projects", :force => true do |t| t.string "name" - t.string "description", :default => "" + t.text "description" t.integer "commit_count", :default => 0 t.integer "code_line", :default => 0 t.integer "users_count", :default => 0 t.date "last_commit_time" t.string "url" t.date "date_collected" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "praise_tread_caches", :force => true do |t|