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

app/controllers/files_controller.rb

@@ -44,11 +44,11 @@ class FilesController < ApplicationController
 
       if params[:sort]
         if params[:sort].include?":"
-          @orderBy = params[:sort].split(":")[0];
+          @orderBy = params[:sort].split(":")[0]
-          @orderType = params[:sort].split(":")[1].split(",")[0];
+          @orderType = params[:sort].split(":")[1].split(",")[0]
         else
-          @orderBy = params[:sort].split(",")[0];
+          @orderBy = params[:sort].split(",")[0]
-          @orderType = "asc";
+          @orderType = "asc"
         end
       end
 

app/controllers/notificationcomments_controller.rb

@@ -1,4 +1,7 @@
 class NotificationcommentsController < ApplicationController
+  def show
+
+  end
   # default_search_scope :contestnotifications
   # model_object Contestnotifications
   # before_filter :authorize
@@ -20,8 +23,14 @@ class NotificationcommentsController < ApplicationController
   end
 
   def destroy
-    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
+    @contest = Contest.find(params[:contest_id])
-    redirect_to contest_contestnotification_path(@contestnotifications)
+    @contestnotification = Contestnotification.find(params[:contestnotification_id])
+    notificaioncomments = Notificationcomment.find(params[:id])
+    notificaioncomments.destroy if notificaioncomments
+    #@contestnotifications = notificaioncomments.Contestnotification
+    #@contest = @contestnotifications.contest
+    #@contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
+    redirect_to contest_contestnotification_path(@contest,@contestnotification)
   end
   
 end

app/controllers/softapplications_controller.rb

@@ -156,8 +156,8 @@ class SoftapplicationsController < ApplicationController
         format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]), notice: l(:notice_attendingcontest_work_successfully_created) }
         # format.json { render json: @softapplication, status: :created, location: @softapplication }
       else
-        format.js { render status: 406 }
+        #format.js { render status: 406 }
-        format.html { render action: "new" }
+        format.html { render action: "contests/show_attendingcontest" }
         # format.json { render json: @softapplication.errors, status: :unprocessable_entity }
       end
     end

app/helpers/members_helper.rb

@@ -53,10 +53,13 @@ module MembersHelper
 
   # 当前申请加入的成员名单
   def render_principals_for_applied_members(project)
-    scope = Principal.active.sorted.applied_members(project).like(params[:q])
+    scope = project.applied_projects.map(&:user)
     principal_count = scope.count
     principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page']
-    principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+    offset ||= principal_pages.offset
+    principals = scope[offset, 10]
+    #principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+    #principals = ApplicationController.new.paginateHelper scope,10
 
     s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
 

app/models/notificationcomment.rb

@@ -4,6 +4,7 @@ class Notificationcomment < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :notificationcommented, :polymorphic => true#, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  belongs_to :Contestnotification
 
   validates_presence_of :notificationcommented, :author, :notificationcomments
 

app/models/softapplication.rb

@@ -11,7 +11,7 @@ class Softapplication < ActiveRecord::Base
   belongs_to :project
   has_many :contests, :through => :contesting_softapplications
 
-  validates_length_of :name, :maximum => 125
+  validates_length_of :name, :maximum => 25
   validates_length_of :application_developers, :maximum => 125
   validates_length_of :android_min_version_available, :maximum => 125
 

app/views/bids/_homework_list.html.erb

@@ -8,7 +8,7 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span>
-        <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %>
+        <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %>
             </td>
             <td align="right">
                 <div class="project-search">
@@ -106,7 +106,7 @@
             <td>
               <strong>提交文件:&nbsp;
                 <% if is_evaluation  || is_teacher%>
-                  <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework, :remote => true%>
+                  <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
                 <% else %>
                     <span class="required">未开启互评功能作业不允许下载</span>
                 <% end %>

app/views/contestnotifications/show.html.erb

@@ -69,7 +69,21 @@
 			<td>
 			<table width="580px" border="0">
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+					<td colspan="2" valign="top">
+                      <strong>
+                        <%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %>
+                      </strong>
+                      <span class="font_lighter">
+                        <%= l(:label_project_newadd) %>
+                      </span>
+                        <%= l(:label_comment_plural) %>
+                    </td>
+                    <td>
+                      <% if notificationcomment.author==User.current|| User.current.admin? %>
+                          <%= link_to(l(:label_bid_respond_delete),  contest_contestnotification_notificationcomment_path(@contest, @contestnotification,notificationcomment),
+                                       :method => :delete,:confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
+                      <% end %>
+                    </td>
 				</tr>
 				<tr>
 					<td colspan="2" width="580px" >

app/views/files/_course_show_all_attachment.html.erb

@@ -21,7 +21,7 @@
     <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+    <!-- <%#= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>
   <tbody>

app/views/files/_show_all_attachment.html.erb

@@ -21,7 +21,7 @@
     <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+    <!-- <%#= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>
   <tbody>

app/views/messages/_course_show.html.erb

@@ -104,6 +104,8 @@
     <div class="memo-content">
       <%= textilizable(@topic, :content) %>
       <%= link_to_attachments @topic, :author => false %>
+      <%# options = {:author => true, :deletable => @topic.author.eql?(User.current)} %>
+      <%#= render :partial => 'attachments/app_link', :locals => {:attachments => @topi.attachments, :options => options} %>
     </div>
     <div class="memo-timestamp">
       <div style="float: left"><%= authoring @topic.created_on, @topic.author %></div>

app/views/my/account.html.erb

@@ -82,7 +82,7 @@
         </span>
         
         <span id='enterprise' style='display:none'>
-        <p style="width:400px;padding-left: 26px;">企业名<%= text_field_tag :enterprise_name, @user.firstname %>
+        <p style="width:400px;padding-left: 26px;"><%= l(:label_company_name)%><%= text_field_tag :enterprise_name, @user.firstname %>
         </p>
         </span>
 

app/views/softapplications/_form.html.erb

@@ -113,7 +113,7 @@
 					<%= render :partial => 'attachments/form'  %>
 				</p>
 				<p style="font-size: 10px">1、<%=l(:label_upload_softapplication_packets_mustpacketed)%><br>2、<%=l(:label_upload_softapplication_photo_condition)%></p>
-				<p style="font-size: 10px; color: red"><%=l(:label_updated_caution)%></p>
+				<!-- p style="font-size: 10px; color: red"><%#=l(:label_updated_caution)%></p-->
 					
 		</fieldset>
 	</fieldset></br>	  

app/views/welcome/course.html.erb

@@ -169,13 +169,15 @@
                   (<%= link_to "#{files_count}份", course_files_path(course) %>资料)
                 </div>
 
-                <div class='join_course_link'>
+                <!--
-                  <% if !course_endTime_timeout?(course) %>
+                 <div class='join_course_link'>
+                  <%# if !course_endTime_timeout?(course) %>
                       <div>
-                        <%= join_in_course(course, User.current) %>
+                        <%#= join_in_course(course, User.current) %>
                       </div>
-                  <% end %>
+                  <%# end %>
                 </div>
+                -->
               </li>
                   <%end%>
           <% end; reset_cycle %>

app/views/wiki/edit.html.erb

@@ -16,6 +16,9 @@
 <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
                   :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
 
+  <!--p style="max-width:680px"><input id="editor02" required="true" /><%#= f.text_area :comments, :required => true, :id => 'editor02' %></p>
+  <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script-->
+
 <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
   <%= fields_for @page do |fp| %>
     <p>

config/locales/en.yml

@@ -229,7 +229,7 @@ en:
   field_description: Description
   field_summary: Summary
   field_is_required: Required
-  field_firstname: First name
+  field_firstname: Name
   field_lastname: Last name
   field_mail: Email
   field_job_category: Job category   # added by bai
@@ -1707,7 +1707,7 @@ en:
   label_upload_softapplication_packets: Upload-apppacket
   label_upload_softapplication_photo: Upload-appphoto
   label_upload_softapplication_packets_mustpacketed: Works code and ralated-document must be packaged before upload.
-  label_upload_softapplication_photo_condition: Need upload 0~4 works screenshot, each is less than 5M, photo format such as gif,jpg,png etc.
+  label_upload_softapplication_photo_condition: The best works. 0~4 (redundant pictures would not show page), each is less than 5M, photo format such as gif,jpg,png etc.
   label_updated_caution: Note:if you edit the work, the uploaded screenshot and package will be deleted, please re-load!
   label_softapplication_name: App-name
   label_work_name: Work name
@@ -1799,3 +1799,6 @@ en:
 
   # ajax异步验证
   modal_valid_passing: can be used.
+
+  label_company_name: Company Name
+  notice_account_invalid_creditentials_new: You have not to the mailbox activation

config/locales/zh.yml

@@ -1975,7 +1975,7 @@ zh:
   label_upload_softapplication_packets: 上传应用软件包
   label_upload_softapplication_photo: 上传产品截图
   label_upload_softapplication_packets_mustpacketed: 作品相关代码及相关说明文件必须打包后以压缩包的形式上传，便于上传和下载 ；
-  label_upload_softapplication_photo_condition: 作品截图需上传0~4张；格式为gif/jpg/png， 每张小于5M
+  label_upload_softapplication_photo_condition: 作品截图最好0~4张(多余图片不会再展示页面上显示)；格式为gif/jpg/png， 每张小于5M
   label_updated_caution: 注意：若编辑参赛作品，则之前上传的软件包和截图都将被删除，请重新上传！
   label_softapplication_name: 应用名称
   label_work_name: 作品名称
@@ -2016,6 +2016,7 @@ zh:
   label_contest_work_list: 参赛作品列表
   label_attending_contest: 我要参赛
   label_contest_notification: 竞赛通知
+  label_company_name: 企业名
   
   label_coursefile_sharingarea: 课程资源共享区
   label_sort_by_activity: 按动态数排序

config/routes.rb

@@ -83,6 +83,10 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  #resources :notificationcomments do
+  #
+  #end
+
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
   # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
   # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
@@ -91,7 +95,9 @@ RedmineApp::Application.routes.draw do
   resources :contests, only: [:index] do
     resources :contestnotifications do
       # get 'preview', on: :collection
-      resources :notificationcomments
+      resources :notificationcomments do
+
+      end
     end
 
     collection do

db/migrate/20140801034242_change_boards_name.rb

@@ -0,0 +1,20 @@
+# -*coding:utf-8 -*-
+class ChangeBoardsName < ActiveRecord::Migration
+  def up
+    boards = Board.where("project_id <> -1 and name like '%课程讨论区%'")
+    boards.each do |board|
+      board.name = "项目讨论区"
+      board.description = "项目讨论区"
+      board.save(:validate => false)
+    end
+  end
+
+  def down
+    boards = Board.where("project_id <> -1 and name like '%项目讨论区%'")
+    boards.each do |board|
+      board.name = " 课程讨论区"
+      board.description = " 课程讨论区"
+      board.save(:validate => false)
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140730024419) do
+ActiveRecord::Schema.define(:version => 20140801034242) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false