Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Gemfile

@@ -1,4 +1,4 @@
-source 'https://ruby.taobao.org'
+source 'http://ruby.taobao.org'
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
@@ -22,12 +22,12 @@ group :development do
 end
 
 group :test do
-  #gem "shoulda", "~> 3.3.2"
-  gem "shoulda", "> 3.3.2"
-  gem "mocha", "~> 0.13.3"
-  gem 'capybara', '~> 2.0.0'
-  gem 'nokogiri', '< 1.6.0'
-  gem 'factory_girl'
+  gem "shoulda", "~> 3.5.0"
+  gem "mocha", "~> 1.1.0"
+  gem 'capybara', '~> 2.4.1'
+  gem 'nokogiri', '~> 1.6.3'
+  gem 'factory_girl', '~> 4.4.0'
+  gem 'selenium-webdriver', '~> 2.42.0'
 
   platforms :mri, :mingw do
     group :rmagick do
@@ -40,11 +40,11 @@ group :test do
 end
 
 group :development, :test do
-	gem "guard-rails"
-	gem 'spork-testunit'
-	gem 'guard-spork'
+	gem "guard-rails", '~> 0.5.3'
+	gem 'spork-testunit', '~> 0.0.8'
+	gem 'guard-spork', '~> 1.5.1'
 	gem 'guard-test', '~> 1.0.0'
-	gem 'ruby-prof' unless RUBY_PLATFORM =~ /w32/
+	gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/
 	gem 'pry'
 	gem 'pry-nav'
 end

Gemfile.lock

@@ -19,7 +19,7 @@ PATH
       rails
 
 GEM
-  remote: https://ruby.taobao.org/
+  remote: http://ruby.taobao.org/
   remote: https://rubygems.org/
   specs:
     actionmailer (3.2.13)
@@ -53,13 +53,12 @@ GEM
       rails (>= 3, < 5)
     arel (3.0.3)
     builder (3.0.0)
-    capybara (2.0.3)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     childprocess (0.5.3)
@@ -90,7 +89,7 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rails (0.5.2)
+    guard-rails (0.5.3)
       guard (~> 2.0)
     guard-spork (1.5.1)
       childprocess (>= 0.2.3)
@@ -122,14 +121,17 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mocha (0.13.3)
+    mini_portile (0.6.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     mysql2 (0.3.11)
     mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
-    nokogiri (1.5.11)
-    nokogiri (1.5.11-x86-mingw32)
+    nokogiri (1.6.3)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.3-x86-mingw32)
+      mini_portile (= 0.6.0)
     paperclip (3.5.4)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -233,7 +235,7 @@ GEM
       json (>= 1.8.0)
     websocket (1.0.7)
     win32console (1.3.2-x86-mingw32)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -246,22 +248,22 @@ DEPENDENCIES
   acts-as-taggable-on (= 2.4.1)
   better_errors!
   builder (= 3.0.0)
-  capybara (~> 2.0.0)
+  capybara (~> 2.4.1)
   coderay (~> 1.0.6)
   coffee-rails (~> 3.2.1)
-  factory_girl
+  factory_girl (~> 4.4.0)
   fastercsv (~> 1.5.0)
-  guard-rails
-  guard-spork
+  guard-rails (~> 0.5.3)
+  guard-spork (~> 1.5.1)
   guard-test (~> 1.0.0)
   htmlentities
   i18n (~> 0.6.0)
   jquery-rails (~> 2.0.2)
   kaminari
-  mocha (~> 0.13.3)
+  mocha (~> 1.1.0)
   mysql2 (= 0.3.11)
   net-ldap (~> 0.3.1)
-  nokogiri (< 1.6.0)
+  nokogiri (~> 1.6.3)
   paperclip (~> 3.5.4)
   pry
   pry-nav
@@ -273,7 +275,8 @@ DEPENDENCIES
   ruby-openid (~> 2.1.4)
   sass-rails (~> 3.2.3)
   seems_rateable!
-  shoulda (> 3.3.2)
-  spork-testunit
+  selenium-webdriver (~> 2.42.0)
+  shoulda (~> 3.5.0)
+  spork-testunit (~> 0.0.8)
   therubyracer
   uglifier (>= 1.0.3)

app/controllers/attachments_controller.rb

@@ -55,10 +55,10 @@ class AttachmentsController < ApplicationController
     candown = false
     if @attachment.container.has_attribute?(:project) && @attachment.container.project
       project = @attachment.container.project
-      candown= User.current.member_of?(project) || (project.is_public==1 && @attachment.is_public == 1)
+      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
     elsif  @attachment.container.is_a?(Project)
       project = @attachment.container
-      candown= User.current.member_of?(project) || (project.is_public==1 && @attachment.is_public == 1)
+      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
     elsif @attachment.container.has_attribute?(:course) && @attachment.container.course
       course = @attachment.container.course
       candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)

app/controllers/boards_controller.rb

@@ -140,7 +140,11 @@ private
   end
 
   def find_board_if_available
+    if @project
       @board = @project.boards.find(params[:id]) if params[:id]
+    elsif @course
+      @board = @course.boards.find(params[:id]) if params[:id]
+    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/contests_controller.rb

@@ -78,6 +78,10 @@ class ContestsController < ApplicationController
     end
   end
 
+  def search
+    redirect_to action: 'index',name:params[:name]
+  end
+
   def homework
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @bids = @course.homeworks.order('deadline DESC')

app/controllers/messages_controller.rb

@@ -77,6 +77,9 @@ class MessagesController < ApplicationController
 
   # Reply to a topic
   def reply
+    if params[:reply][:content] == ""
+      (redirect_to board_message_path(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
+    end
     @reply = Message.new
     @reply.author = User.current
     @reply.board = @board
@@ -112,11 +115,20 @@ class MessagesController < ApplicationController
     (render_403; return false) unless @message.destroyable_by?(User.current)
     r = @message.to_param
     @message.destroy
+    # modify by nwb
+    if @project
       if @message.parent
         redirect_to board_message_path(@board, @message.parent, :r => r)
       else
         redirect_to project_board_path(@project, @board)
       end
+    elsif @course
+      if @message.parent
+        redirect_to board_message_path(@board, @message.parent, :r => r)
+      else
+        redirect_to course_board_path(@course, @board)
+      end
+    end
   end
 
   def quote

app/controllers/softapplications_controller.rb

@@ -140,13 +140,14 @@ class SoftapplicationsController < ApplicationController
 
 #new changed created function
   def create
+    #options = params[:softapplication]
+    #options[:app_type_name] = params[:other_input] if options[:app_type_name] == "其他" && params[:other_input]
     @softapplication = Softapplication.new(params[:softapplication])
     @softapplication.user = User.current
     #@softapplication.deposit_project = params[:project]
     @softapplication.project = Project.find_by_id(params[:project])
-    
+    @softapplication.app_type_name = params[:other_input] if  params[:other_input] != ""
     @softapplication.save_attachments(params[:attachments])
-    
     respond_to do |format|
       if @softapplication.save
         ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id)
@@ -175,8 +176,16 @@ class SoftapplicationsController < ApplicationController
     @softapplication.save_attachments(params[:attachments])
     #@softapplication.deposit_project = params[:project]
     @softapplication.project = Project.find_by_id(params[:project])
+
+    @softapplication.name = params[:softapplication][:name]
+    @softapplication.android_min_version_available = params[:softapplication][:android_min_version_available]
+    @softapplication.app_type_name = params[:other_input] == "" ? params[:softapplication][:app_type_name] : params[:other_input]
+    @softapplication.description = params[:softapplication][:description]
+    @softapplication.application_developers = params[:softapplication][:application_developers]
+    #@softapplication.app_type_name = params[:other_input] if  params[:other_input] != ""
     respond_to do |format|
-      if @softapplication.update_attributes(params[:softapplication])
+      #if @softapplication.update_attributes(params[:softapplication])
+      if @softapplication.save
         format.html { redirect_to @softapplication, notice: l(:notice_softapplication_was_successfully_updated) }
         format.json { head :no_content }
       else

app/controllers/users_controller.rb

@@ -151,6 +151,9 @@ class UsersController < ApplicationController
 
   #  added by fq
   def user_activities
+    redirect_to user_path(@user, type: params[:type]) 
+    return
+    # useless abort.
     @watcher = User.watched_by_id(@user)
     events = []
     for user in @watcher

app/controllers/welcome_controller.rb

@@ -118,6 +118,11 @@ class WelcomeController < ApplicationController
     search_condition = params[:q] 
     search_type = params[:search_type].to_sym unless search_condition.blank?
 
+    if search_type.nil? && params[:contests_search] && params[:name] != ""
+      search_type  = :contests
+      search_condition = params[:name]
+    end
+
     respond_to do |format|
       format.html{
         case search_type
@@ -126,6 +131,8 @@ class WelcomeController < ApplicationController
                                             :project_type => Project::ProjectType_project)
         when :courses
           redirect_to courses_search_path(:name => search_condition)
+        when :contests
+          redirect_to contests_path(:name => search_condition)
         when :users
           redirect_to users_search_path(:name => search_condition)
         when :users_teacher

app/helpers/courses_helper.rb

@@ -26,11 +26,11 @@ module CoursesHelper
   end
 
   # 返回学生数量，即roles表中定义的Reporter
-  def studentCount project
-    searchStudent(project).count
+  #def studentCount project
+   # searchStudent(project).count
     # or
     # searchStudent(project).count
-  end
+ # end
 
   # 判断用户是否是课程的管理员
   # add by nwb

app/helpers/softapplications_helper.rb

@@ -14,6 +14,19 @@ module SoftapplicationsHelper
       content_tag('div', content, :class => "tabs")
     end
 
+    #作品分类下拉框
+    def work_type_opttion
+      type = []
+      #work_types = WorksCategory.all
+      WorksCategory.all.each do |work_type|
+        option = []
+        option << work_type.category
+        option << work_type.category
+        type << option
+      end
+      type
+    end
+    
     # def select_option_helper option
       # tmp = Hash.new
       # option.each do |project|

app/views/contests/show_attendingcontest.html.erb

@@ -60,6 +60,21 @@
         $("#put-project-form").hide();
     }
 
+    function selectChange(obj)
+    {
+        if(obj.value=="其他")
+        {
+            //document.getElementById("a").style.display = ""
+            $("#other_span").show();
+        }
+        else
+        {
+            $("#other_span").hide();
+            $("#other_input").val("");
+            //document.getElementById("a").style.display = "none"
+        }
+    }
+
 </script>
 <%= render_flash_messages %>
 <!--参赛步骤-->
@@ -115,9 +130,13 @@
             <span>
               <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
             </span>
-            <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:358px;"}  %>
+            <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:358px;",:onchange => "selectChange(this)"}  %>
             <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
           </td>
+          <span style="font-size: 10px;display: none" id="other_span">
+            <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
+            <input type="text" style="width: 100px;" id="other_input" name = "other_input"/>
+          </span>
         </tr>
         <br/>
         <br/>

app/views/courses/_course.html.erb

@@ -43,7 +43,8 @@
 	</p>
 	<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 => @course.members.count)) %>
+         <%= content_tag('span',  l(:label_x_member, :count => studentCount(@course)+teacherCount(@course))) %>
 	</p>
 	
 	<!--gcm-->

app/views/courses/new.html.erb

@@ -2,12 +2,12 @@
    @nav_dispaly_forum_label = 1
    @nav_dispaly_course_label = nil
    @nav_dispaly_store_all_label = 1 %>
-<%= labelled_form_for @course do |f| %>
     <h3><%=l(:label_course_new)%></h3>
+<%= labelled_form_for @course do |f| %>
     <div class="box tabular">
      <%= render :partial => 'course_form', :locals => { :f => f } %>
       <span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
-      <!-- <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
+      <!-- <%#= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
     <%= javascript_tag "$('#course_name').focus();" %>
     </div>
 <% end %>

app/views/files/_course_file.html.erb

@@ -12,21 +12,6 @@
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @course) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @course) %>
     <p></p>
-    <div class="box" id="files-box">
-      <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
-    <% if attachmenttypes.any? %>
-        &nbsp; &nbsp; &nbsp;
-        <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
-        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
-                       :onchange => "course_attachmenttypes_searchex(this.value)" %>
-    <% end %>
-    <% if sufixtypes.any? %>
-        &nbsp;
-        <label for="attach_sufix_browse_label"><%= l(:attachment_sufix_browse) %></label>
-        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
-                       :onchange => "course_attachment_contenttypes_searchex(this.value)" %>
-    <% end %>
-    </div>
     <div id="upload_file_div" class="relation_file_div hidden">
       <%= render :partial => 'course_new', locals: {course: @course} %>
     </div>
@@ -59,6 +44,21 @@
       <div class="line_under" style="margin:20px 0px;"></div>
     </div>
   </div>
+  <div class="box" id="files-box">
+    <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
+    <% if attachmenttypes.any? %>
+        &nbsp; &nbsp; &nbsp;
+        <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
+        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
+                       :onchange => "course_attachmenttypes_searchex(this.value)" %>
+    <% end %>
+    <% if sufixtypes.any? %>
+        &nbsp;
+        <label for="attach_sufix_browse_label"><%= l(:attachment_sufix_browse) %></label>
+        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
+                       :onchange => "course_attachment_contenttypes_searchex(this.value)" %>
+    <% end %>
+  </div>
 
 </div>
 <%= javascript_tag "observeSearchfield('attach_search', null, '#{ escape_javascript attachments_autocomplete_path(:course_id => @course.id, :format => 'js') }')" %>

app/views/files/_project_file.html.erb

@@ -12,21 +12,7 @@
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
     <p></p>
-    <div class="box" id="files-box">
-      <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
-    <% if attachmenttypes.any? %>
-        &nbsp; &nbsp; &nbsp;
-        <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
-        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
-                       :onchange => "attachmenttypes_searchex(this.value)" %>
-    <% end %>
-    <% if sufixtypes.any? %>
-        &nbsp;
-        <label for="attach_sufix_browse_label"><%= l(:attachment_sufix_browse) %></label>
-        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
-                       :onchange => "attachment_contenttypes_searchex(this.value)" %>
-    <% end %>
-    </div>
+
 
     <div id="upload_file_div" class="relation_file_div hidden">
       <%= render :partial => 'new', locals: {project: @project} %>
@@ -61,6 +47,21 @@
     </div>
   </div>
 
+  <div class="box" id="files-box">
+    <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
+    <% if attachmenttypes.any? %>
+        &nbsp; &nbsp; &nbsp;
+        <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
+        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
+                       :onchange => "attachmenttypes_searchex(this.value)" %>
+    <% end %>
+    <% if sufixtypes.any? %>
+        &nbsp;
+        <label for="attach_sufix_browse_label"><%= l(:attachment_sufix_browse) %></label>
+        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
+                       :onchange => "attachment_contenttypes_searchex(this.value)" %>
+    <% end %>
+  </div>
 </div>
 <%= javascript_tag "observeSearchfield('attach_search', null, '#{ escape_javascript attachments_autocomplete_path(:project_id => @project.id, :format => 'js') }')" %>
 

app/views/news/_course_show.html.erb

@@ -10,7 +10,7 @@
 
 <h3><strong><%=h @news.title %></strong></h3>
 
-<% if authorize_for('news', 'edit') %>
+<% if authorize_for_course('news', 'edit') %>
     <div id="edit-news" style="display:none;">
       <%= labelled_form_for :news, @news, :url => news_path(@news),
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>

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 %>
+
+          <% 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)%>
 		&nbsp;&nbsp;&nbsp;<%= l(:label_course_college) %>：
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>

app/views/softapplications/_form.html.erb

@@ -1,3 +1,19 @@
+<script  type="text/javascript" language="javascript">
+    function selectChange(obj)
+    {
+        if(obj.value=="其他")
+        {
+            //document.getElementById("a").style.display = ""
+            $("#other_span").show();
+        }
+        else
+        {
+            $("#other_span").hide();
+            $("#other_input").val("");
+            //document.getElementById("a").style.display = "none"
+        }
+    }
+</script>
 <%= form_for(softapplication) do |f| %>
 
 	  <% if softapplication.errors.any? %>
@@ -17,7 +33,7 @@
 			<span><%= l(:label_work_name) %></span>
 			<span class="contest-star"> * </span>: <td ><%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %></td>
 			<span><%= l(:label_softapplication_name_condition)%></span>
-		</tr></ br>
+		</tr><br/>
 		<br /> 
 		<br />
 		
@@ -25,16 +41,32 @@
 			<span><%= l(:label_running_platform) %></span>
 			<span class="contest-star"> * </span>: <td style="width: 100px"><%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %></td>
 	
-		</tr></ br>
+		</tr>
+       <br/>
 		<br />
 		<br />
 		
 		<tr style="width:800px;">
 			<span><%= l(:label_work_type) %></span>
-	
-			<span class="contest-star"> * </span>: <td style="width: 100px"><%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %></td>
-	
-		</tr></ br>
+			<span class="contest-star"> * </span>:
+          <td style="width: 100px">
+            <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
+            <% if work_type_opttion.include?([@softapplication.app_type_name,@softapplication.app_type_name]) %>
+                <%= f.select :app_type_name,options_for_select(work_type_opttion,@softapplication.app_type_name), {},{:style => "width:410px;",:onchange => "selectChange(this)"}  %>
+                <span style="font-size: 10px;display: none" id="other_span">
+                    <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
+                  <input type="text" style="width: 100px;" id="other_input" name = "other_input"/>
+                </span>
+            <% else %>
+                <%= f.select :app_type_name,options_for_select(work_type_opttion,"其他"), {},{:style => "width:410px;",:onchange => "selectChange(this)"}  %>
+                <span style="font-size: 10px;" id="other_span">
+                    <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
+                  <input type="text" style="width: 100px;" id="other_input" name = "other_input" value="<%= @softapplication.app_type_name%>"/>
+                </span>
+            <% end %>
+          </td>
+		</tr>
+       <br/>
 		<br />
 		<br />
 		
@@ -42,7 +74,8 @@
 			<span><%= l(:label_work_description) %></span>
 			<span class="contest-star"> * </span>: <td style="width: 100px"><%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %></td>
 			<span><%= l(:label_softapplication_description_condition)%></span>
-		</tr></ br>
+		</tr>
+       <br/>
 		<br />
 		<br />
 	
@@ -50,15 +83,17 @@
 			<span><%= l(:label_softapplication_developers) %></span>
 			<span class="contest-star"> * </span>: <td style="width: 100px"><%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %></td>
 	
-		</tr></ br>
+		</tr>
+       <br/>
 		<br />
 		<br />
 		
 		<tr style="width:800px;">
 			<span><%= l(:label_work_deposit_project) %>：</span>
-			<span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline3' %></span>
+			<span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option),@softapplication.project_id), :name => 'project', :class => 'grayline3' %></span>
 			<span><%#= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target=>'_blank'%></span>
-		</tr><br/>
+		</tr>
+       <br/>
 		<br />
 		<br />
 		

app/views/softapplications/edit.html.erb

@@ -2,7 +2,7 @@
 
 <%= render partial: 'form', locals:{softapplication: @softapplication} %>
 
-<!-- <%= link_to 'Show', @softapplication %> 
-<%= link_to 'Back', softapplications_path %> -->
+<!-- <%#= link_to 'Show', @softapplication %>
+<%#= link_to 'Back', softapplications_path %> -->
 
 

app/views/users/show.html.erb

@@ -383,13 +383,13 @@
     $(document).ready(function ($) {
         $("#content .menu-div:first~ div").first().find("a").attr("target", "_blank");
         $('[mode=all]').click(function (event) {
-            window.location.href = '<%=user_activities_url%>';
+            window.location.href = '<%=user_url(@user)%>';
         });
         $('[mode=myself]').click(function (event) {
-            window.location.href = '<%=user_activities_url(type: 1)%>';
+            window.location.href = '<%=user_url(@user, type: 1)%>';
         });
         $('[mode=respond]').click(function (event) {
-            window.location.href = '<%=user_activities_url(type: 2)%>';
+            window.location.href = '<%=user_url(@user, type: 2)%>';
         });
     });
 </script>

app/views/welcome/contest.html.erb

@@ -136,11 +136,11 @@
 
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
-		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
+      <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
 			<%= text_field_tag 'name', params[:name], :placeholder => l(:label_search_intimation), name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
-			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
+			<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
 		<% end %>
 		<!-- <div class='font_lighter' style="display: inline-block; margin-top:3px;">竞赛相关内容搜索,如竞赛题目，参赛题目，参赛人名等。</div> -->
 	</div>

app/views/words/create_reply.js.erb

@@ -5,9 +5,15 @@
 		) %>').hide();
 	$('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append);
 	pre_append.fadeIn(600);
+
 var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
 textarea.val('');
 $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+
+var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
+textarea1.val('');
+$('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+
 	setMaxLengthItem(pre_append.find('textarea')[0]);
 <% else %>
 	alert("<%= l(:label_feedback_fail) %>");

config/locales/en.yml

@@ -1646,6 +1646,7 @@ en:
   label_memo_locked: 'Topic is locked'
   label_downloads_list: enter file list.
   label_sumbit_empty: search bar need container.
+  label_reply_empty: Reply Cann't Empty.
   label_setup_time: Start date    
   label_endup_time: Over date 
   label_class_period: Class hour

config/locales/zh.yml

@@ -1933,6 +1933,7 @@ zh:
   label_contest_reason: 参赛宣言：
   label_notification: 通知
   label_sumbit_empty: 搜索内容不能为空
+  label_reply_empty: 回复内容不能为空
   no_use: 没有帮助
   cancel_no_use: 撤销没有帮助
   cancel_apply: 取消申请