Merge remote-tracking branch 'origin/szzh' into szzh

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

app/helpers/project_score_helper.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+class ProjectScoreHelper
+  #缺陷数量
+  def issue_num project
+
+  end
+
+end

app/views/courses/_course.html.erb

@@ -44,7 +44,7 @@
 	<p class="stats">
 		<%= 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))) %>
 	</p>
 	
 	<!--gcm-->

app/views/memos/_reply_box.html.erb

@@ -4,7 +4,7 @@
 		<%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
     <div id="message_quote" class="wiki"></div>
 
-    <%= text_area :quote,:quote,:style => 'display:none' %>
+    <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
 		<%= label_tag(l(:label_reply_plural)) %>:
 		<!-- <p> < %= f.text_area :content, :required => true, :size => "75%", :resize => "none", id: 'editor01' %> </p> -->
 		<%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'editor01', :value => @content %></p>

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");

db/schema.rb

@@ -419,9 +419,9 @@ ActiveRecord::Schema.define(:version => 20140730024419) do
     t.string   "web_title"
     t.string   "title"
     t.text     "description"
+    t.string   "page_type"
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
-    t.string   "page_type"
     t.integer  "sort_type"
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
@@ -882,19 +882,6 @@ ActiveRecord::Schema.define(:version => 20140730024419) 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