From 1914639bc309ad486ae300d103832ef0003e39c0 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 23 Nov 2015 10:17:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=90=E6=88=90=E5=91=98=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E4=B8=AD=E8=BE=93=E5=85=A5=E7=9A=84=E8=AF=A5?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=85=B3=E9=94=AE=E5=AD=97=E5=B0=B1=E8=A6=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_member/create.js.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/org_member/create.js.erb b/app/views/org_member/create.js.erb index f1e48281f..25bbded34 100644 --- a/app/views/org_member/create.js.erb +++ b/app/views/org_member/create.js.erb @@ -4,4 +4,5 @@ $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); $("#principals_for_new_member").html(''); $("#org_members_count_id").html("<%= @org.org_members.count %>"); + $("#not_org_member_search").val(""); <% end %> \ No newline at end of file From 71e98c873d70e19218cacc8d3cbd9b0638d56b80 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 23 Nov 2015 16:40:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=BA=E7=81=B0=E8=89=B2=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=94=BE=E5=9C=A8=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9B=BE=E7=89=87=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E4=BA=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_org_document.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e74da846e..0142e6f37 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -87,7 +87,7 @@
-
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
From 68bb1422781e1f8f898dda61d22601761ed9fc66 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 23 Nov 2015 17:29:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87bug:?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=BF=87=E6=BB=A4=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E2=80=9C=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E9=80=9A=E7=9F=A5=E7=AD=89=E5=85=B6=E4=BB=96=E5=8A=A8?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_organizations.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 50bb24000..e9d78e695 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -6,12 +6,12 @@
组织列表 - <%= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %> - + + - - 搜索 - <% end %> + + +
From b46561dac1fe3c0083b8550980d6aa08d28c9a80 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 Nov 2015 10:34:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=97=B6=E8=8B=A5=E4=BD=9C=E5=93=81=E5=90=8D=E7=A7=B0=E5=92=8C?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=8F=E8=BF=B0=E4=B8=BA=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E4=B8=8D=E5=BC=B9=E5=87=BA=E4=BD=9C=E5=93=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/edit.html.erb | 13 ++++++++----- app/views/student_work/new.html.erb | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index 517a238b0..d506b5542 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -62,10 +62,13 @@
\ No newline at end of file diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index fdf1e31a3..4f9999277 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -121,10 +121,13 @@
\ No newline at end of file From ccfbc1e0bdb93425667e9ee776a5ebecc2cf16b1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 24 Nov 2015 12:50:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E7=BB=84=E7=BB=87=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0type=E5=8F=82=E6=95=B0=EF=BC=9B=202.=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=84=E7=BB=87=E8=A1=A8=E4=B8=AD=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=92=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=8A=A8=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/_org_activities.html.erb | 2 +- ...1124032319_delete_useless_org_activities.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20151124032319_delete_useless_org_activities.rb diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index aa48fedf1..33ac13e76 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -56,7 +56,7 @@ <% end %> <% if org_act_count == 10 %> -
展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
+
展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> <% end%> diff --git a/db/migrate/20151124032319_delete_useless_org_activities.rb b/db/migrate/20151124032319_delete_useless_org_activities.rb new file mode 100644 index 000000000..705e0dbed --- /dev/null +++ b/db/migrate/20151124032319_delete_useless_org_activities.rb @@ -0,0 +1,18 @@ +class DeleteUselessOrgActivities < ActiveRecord::Migration + def up + OrgActivity.all.each do |act| + if act.container_type == 'Course' + if CourseActivity.where("course_act_type=? and course_act_id =? and course_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 + puts "course" + end + else + if act.container_type == 'Project' and ForgeActivity.where("forge_act_type=? and forge_act_id =? and project_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 + act.destroy + end + end + end + end + + def down + end +end