From d9f312bbe3574a352fd8f473ef81421cbb9a7701 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Jul 2015 09:56:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?1=E3=80=81=E5=BD=93=E4=BD=9C=E5=93=81?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=89=93?=
=?UTF-8?q?=E5=BC=80=E4=BD=9C=E5=93=81=E6=8A=A5=E9=94=99=202=E3=80=81?=
=?UTF-8?q?=E4=BD=9C=E5=93=81=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E4=BD=9C=E5=93=81?=
=?UTF-8?q?=E5=90=8D=E4=B8=BA=EF=BC=9AXX=E7=9A=84=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/_evaluation_student_work.html.erb | 3 ++-
app/views/student_work/_evaluation_work.html.erb | 3 ++-
app/views/student_work/_show.html.erb | 2 +-
app/views/student_work/_student_work.html.erb | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/views/student_work/_evaluation_student_work.html.erb b/app/views/student_work/_evaluation_student_work.html.erb
index b5bdd6f55..9569718fb 100644
--- a/app/views/student_work/_evaluation_student_work.html.erb
+++ b/app/views/student_work/_evaluation_student_work.html.erb
@@ -9,7 +9,8 @@
<%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
-
- <%= l(:label_total_news) %>
- <%= @news_count %>
- <%= l(:label_course_news_count) %>
-
- <% if @course && User.current.allowed_to?(:manage_news, @course) %>
- <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
-
+
+
+ <%= l(:label_total_news) %>
+ <%= @news_count %>
+ <%= l(:label_course_news_count) %>
+
+ <% if @course && User.current.allowed_to?(:manage_news, @course) %>
+ <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
+
- <% end %>
+ <% end %>
+
+
+ <%= form_tag({:controller => 'news', :action => 'index', :course_id => @course },:remote=>'true', :method => :get,:id=>"news_query_form", :class => 'query_form') do %>
+
+
搜索
+ <% end %>
+
+
+ <%= render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count} %>
- <% if @newss.empty? %>
-
- <%= l(:label_no_data) %>
-
- <% else %>
- <% @newss.each do |news| %>
-
- <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-
- <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
-
- <%= l(:label_release_news) %>:
-
- <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
- <%=link_to "
#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w" %>
-
-
-
-
-
- <%= news.description.html_safe %>
-
-
-
-
-
-
<%= l(:label_create_time)%>:<%= format_time(news.created_on)%>
- <%= link_to_attachments_course news %>
-
- <%#= render :partial => 'student_work/work_attachments', :locals => {:attachments => news.attachments} %>
-
-
-
-
- <% end %>
- <% end %>
-
-
-
-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<%= stylesheet_link_tag 'scm' %>
diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb
new file mode 100644
index 000000000..da963b3cd
--- /dev/null
+++ b/app/views/news/_course_news_list.html.erb
@@ -0,0 +1,47 @@
+
+<% if newss.empty? %>
+
+ <%= l(:label_no_data) %>
+
+<% else %>
+ <% newss.each do |news| %>
+
+ <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
+
+ <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
+
+ <%= l(:label_release_news) %>:
+
+ <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+ <%=link_to "
#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w" %>
+
+
+
+
+
+ <%= news.description.html_safe %>
+
+
+
+
+
+
<%= l(:label_create_time)%>:<%= format_time(news.created_on)%>
+ <%= link_to_attachments_course news %>
+
+ <%#= render :partial => 'student_work/work_attachments', :locals => {:attachments => news.attachments} %>
+
+
+
+
+ <% end %>
+<% end %>
+
+
+
+
+ <%= pagination_links_full obj_pages, obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
\ No newline at end of file
diff --git a/app/views/news/index.js.erb b/app/views/news/index.js.erb
new file mode 100644
index 000000000..04671917b
--- /dev/null
+++ b/app/views/news/index.js.erb
@@ -0,0 +1 @@
+$("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
\ No newline at end of file
From ffe12b92c83a0a45c82f601352fddfef8644f716 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 22 Jul 2015 10:23:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A2=98?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/news_controller.rb | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 56b4a30fc..9385c73ee 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -73,8 +73,14 @@ class NewsController < ApplicationController
@news_count = scope.count
#@news_pages = Paginator.new @news_count, @limit, params['page']
#@offset ||= scope_page.offset
- scope_order = scope.all(:include => [:author, :course],
- :order => "#{News.table_name}.created_on DESC")
+ if params[:subject].nil?
+ scope_order = scope.all(:include => [:author, :course],
+ :order => "#{News.table_name}.created_on DESC")
+ else
+ scope_order = scope.where("news.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course],
+ :order => "#{News.table_name}.created_on DESC")
+ end
+
# :offset => @offset,
# :limit => @limit)
@newss = paginateHelper scope_order,10
@@ -83,6 +89,7 @@ class NewsController < ApplicationController
@news = News.new
render :layout => 'base_courses'
}
+ format.js
format.api
format.atom { render_feed(@newss, :title => (@course ? @course.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
end
@@ -141,7 +148,7 @@ class NewsController < ApplicationController
ids = params[:asset_id].split(',')
update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
end
- # ض̬ļ¼add start
+ # ������ض�̬�ļ�¼add start
teachers = searchTeacherAndAssistant(@course)
for teacher in teachers
if(teacher.user_id != User.current.id)
@@ -155,7 +162,7 @@ class NewsController < ApplicationController
notify.save()
end
end
- # ض̬ļ¼add end
+ # ������ض�̬�ļ�¼add end
render_attachment_warning_if_needed(@news)
flash[:notice] = l(:notice_successful_create)
redirect_to course_news_index_url(@course)