From 890bc7459d26728e1ce52ee85b38ae6241a805de Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 21 Jul 2014 15:31:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=BD=93=E7=AE=A1=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=BF=87=E5=A4=9A=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E3=80=82=E7=82=B9=E5=87=BB=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/new.html.erb | 2 +- app/views/projects/_project.html.erb | 18 ++++++++++++--- db/schema.rb | 33 +++++++++++++++++++--------- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index 55f515a11..3cf6a7c40 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -7,7 +7,7 @@
<%= render :partial => 'course_form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> - + <%= javascript_tag "$('#course_name').focus();" %>
<% end %> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 5f507db3c..bcb10c78b 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -95,9 +95,21 @@ <%= content_tag('span', "#{l(:default_role_manager)}: ") %> <% end %> <% @admin = @project.project_infos%> - <% if @admin.size > 0 %> - <%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %> - <% end %> + + <% if @admin.size > Setting.show_tags_length.to_i then %> + <% i = 0 %> + <% until i>Setting.show_tags_length.to_i do %> + <%= link_to @admin[i].user.name, user_path(@admin[i].user_id) %> + <% i += 1 %> + <% end %> + <%= link_to l(:label_more_tags), member_project_path(@project) %> + <% else %> + <%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %> + <% end %> + + <%# if @admin.size > 0 %> + <%#= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %> + <%# end %> <% if(@project.project_type==1)%>    <%= l(:label_course_college) %>： <%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%> diff --git a/db/schema.rb b/db/schema.rb index 690ec2681..01b42f8a3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -809,18 +809,18 @@ ActiveRecord::Schema.define(:version => 20140719080032) do create_table "relative_memos", :force => true do |t| t.integer "osp_id" t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :null => false + t.string "subject", :null => false + t.text "content", :limit => 16777215, :null => false t.integer "author_id" - t.integer "replies_count", :default => 0 + t.integer "replies_count", :default => 0 t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.boolean "is_quote", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count_crawl", :default => 0 - t.integer "viewed_count_local", :default => 0 + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.boolean "is_quote", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count_crawl", :default => 0 + t.integer "viewed_count_local", :default => 0 t.string "url" t.string "username" t.string "userhomeurl" @@ -844,6 +844,19 @@ ActiveRecord::Schema.define(:version => 20140719080032) do add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" + create_table "rich_rich_files", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "rich_file_file_name" + t.string "rich_file_content_type" + t.integer "rich_file_file_size" + t.datetime "rich_file_updated_at" + t.string "owner_type" + t.integer "owner_id" + t.text "uri_cache" + t.string "simplified_type", :default => "file" + end + create_table "roles", :force => true do |t| t.string "name", :limit => 30, :default => "", :null => false t.integer "position", :default => 1