diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 85dfba8cf..6989b0b4f 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -624,7 +624,9 @@ class CoursesController < ApplicationController "show_course_journals_for_messages" => true } @date_to ||= Date.today + 1 - @date_from = @date_to - @days-1.years + # + @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date + #@date_from = @date_to - @days-1.years @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id])) # 决定显示所用用户或单个用户活动 @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course, diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index a8ba3d426..9e41f467b 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -40,7 +40,32 @@ class FilesController < ApplicationController render :layout => !request.xhr? elsif params[:course_id] @isproject = false - @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)] + + if params[:sort] + if params[:sort].include?":" + @orderBy = params[:sort].split(":")[0]; + @orderType = params[:sort].split(":")[1].split(",")[0]; + else + @orderBy = params[:sort].split(",")[0]; + @orderType = "asc"; + end + end + + if @orderBy=="size" + @orderBy="filesize" + elsif @orderBy=="field_file_dense" + @orderBy="is_public" + elsif @orderBy=="attach_type" + @orderBy="attachtype" + elsif @orderBy=="content_type" + @orderBy="attachtype" + end + + if @orderBy + @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.#{@orderBy} #{@orderType}").find(@course.id)] + else + @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on desc").find(@course.id)] + end render :layout => 'base_courses' end end diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 587b198d7..d7510c385 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -40,7 +40,17 @@ class MemosController < ApplicationController end def create - @quote = params[:quote][:quote] + + if params[:quote].nil? + @quote = "" + else + @quote = params[:quote] + end + + #unless params[:quote].nil? + # @quote = params[:quote][:quote] + #end + @memo = Memo.new(params[:memo]) @memo.forum_id = params[:forum_id] @memo.author_id = User.current.id diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb new file mode 100644 index 000000000..3df2e05b5 --- /dev/null +++ b/app/helpers/project_score_helper.rb @@ -0,0 +1,8 @@ +# encoding: utf-8 +class ProjectScoreHelper + #缺陷数量 + def issue_num project + + end + +end \ No newline at end of file diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index 8e1a7950d..ddf08c3fb 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -44,7 +44,7 @@

<%= content_tag('span', "#{garble @course.members.count}", :class => "info") %> <%#= content_tag('span', l(:label_x_member, :count => @course.members.count)) %> - <%= content_tag('span', l(:label_x_member, :count => studentCount(@course)+teacherCount(@course))) %> + <%= content_tag('span', l(:label_x_member, :count => memberCount(@course))) %>

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 8b713476e..deb590d1f 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -2,7 +2,7 @@

- <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> + <%= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %>

<% @events_by_day.keys.sort.reverse.each do |day| %> diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb index 18cfa032d..9dddf5be4 100644 --- a/app/views/memos/_reply_box.html.erb +++ b/app/views/memos/_reply_box.html.erb @@ -4,7 +4,7 @@ <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
- <%= text_area :quote,:quote,:style => 'display:none' %> + <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %> <%= label_tag(l(:label_reply_plural)) %>: <%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'editor01', :value => @content %>

diff --git a/app/views/memos/quote.js.erb b/app/views/memos/quote.js.erb index a72b7ac9e..d2e8c1d17 100644 --- a/app/views/memos/quote.js.erb +++ b/app/views/memos/quote.js.erb @@ -1,4 +1,4 @@ //ckeditor.setData("<%= raw escape_javascript(@content) %>"); $('#message_quote').html("<%= raw escape_javascript(@temp.content) %>"); -$('#quote_quote').html("<%= raw escape_javascript(@content) %>"); +$('#quote').val("<%= raw escape_javascript(@content) %>"); showAndScrollTo("new_memo", "cke_editor01"); \ No newline at end of file diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 4aa44a571..9d5037107 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,15 +92,15 @@