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

app/controllers/issues_controller.rb

@@ -386,6 +386,7 @@ class IssuesController < ApplicationController
   end
 
   def add_journal
+    if User.current.logged?
       jour = Journal.new
       jour.user_id = User.current.id
       jour.notes = params[:notes]
@@ -396,6 +397,7 @@ class IssuesController < ApplicationController
         format.js
       end
     end
+  end
 
   private
 

app/controllers/messages_controller.rb

@@ -101,27 +101,27 @@ class MessagesController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
-        # 与我相关动态的记录add start
+        # # 与我相关动态的记录add start
-        if(@board && @board.course) #项目的先不管
+        # if(@board && @board.course) #项目的先不管
-          teachers = searchTeacherAndAssistant(@board.course)
+        #   teachers = searchTeacherAndAssistant(@board.course)
-          for teacher in teachers
+        #   for teacher in teachers
-            if(teacher.user_id != User.current.id)
+        #     if(teacher.user_id != User.current.id)
-              notify = ActivityNotify.new()
+        #       notify = ActivityNotify.new()
-              if(@board.course)
+        #       if(@board.course)
-                notify.activity_container_id = @board.course_id
+        #         notify.activity_container_id = @board.course_id
-                notify.activity_container_type = 'Course'
+        #         notify.activity_container_type = 'Course'
-              else
+        #       else
-                notify.activity_container_id = @board.project_id
+        #         notify.activity_container_id = @board.project_id
-                notify.activity_container_type = 'Project'
+        #         notify.activity_container_type = 'Project'
-              end
+        #       end
-              notify.activity_id = @message.id
+        #       notify.activity_id = @message.id
-              notify.activity_type = 'Message'
+        #       notify.activity_type = 'Message'
-              notify.notify_to = teacher.user_id
+        #       notify.notify_to = teacher.user_id
-              notify.is_read = 0
+        #       notify.is_read = 0
-              notify.save()
+        #       notify.save()
-            end
+        #     end
-          end
+        #   end
-        end
+        # end
         # 与我相关动态的记录add end
 
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})

app/controllers/users_controller.rb

@@ -296,6 +296,7 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
+    if User.current == @user
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
       @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
@@ -303,6 +304,9 @@ class UsersController < ApplicationController
         format.js
         format.html {render :layout => 'new_base_user'}
       end
+    else
+      render_403
+    end
   end
 
   #导入作业
@@ -345,6 +349,7 @@ class UsersController < ApplicationController
   end
 
   def new_user_commit_homework
+    if User.current.logged?
       @user = User.current
       @homework = HomeworkCommon.find(params[:homework_id])
       @is_test = params[:is_test] == 'true'
@@ -356,6 +361,9 @@ class UsersController < ApplicationController
         format.js
         format.html {render :layout => 'new_base_user'}
       end
+    else
+      render_403
+    end
   end
 
   def user_commit_homework
@@ -364,6 +372,7 @@ class UsersController < ApplicationController
   end
 
   def user_new_homework
+    if User.current.logged?
       if params[:homework_common]
         homework = HomeworkCommon.new
         homework.name = params[:homework_common][:name]
@@ -412,6 +421,9 @@ class UsersController < ApplicationController
           redirect_to user_homeworks_user_path(User.current.id)
         end
       end
+    else
+      render_403
+    end
   end
 
   #用户从资源库导入资源到作业
@@ -507,6 +519,7 @@ class UsersController < ApplicationController
         att_copy = atta.copy
         att_copy.container_id = nil
         att_copy.container_type = nil
+        att_copy.author_id = User.current.id
         att_copy.copy_from = atta.id
         att_copy.save
         @attachments << att_copy
@@ -771,7 +784,7 @@ class UsersController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    course_types = "('Message','News','HomeworkCommon','poll')"
+    course_types = "('Message','News','HomeworkCommon','Poll')"
     project_types = "('Message','Issue')"
     if params[:type].present?
       case params[:type]

app/helpers/user_score_helper.rb

@@ -423,7 +423,7 @@ module UserScoreHelper
 
   #更新分数
   def update_score(option_number)
-    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + active(option_number)
+    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + project_active(option_number)
     if option_number.total_score < 0
       option_number.total_score = 0
     end
@@ -433,7 +433,7 @@ module UserScoreHelper
 
   #协同得分
   def collaboration(option_number)
-    option_number.messages_for_issues + option_number.issues_status + option_number.replay_for_message + option_number.replay_for_memo
+    option_number.memo * 2 + option_number.messages_for_issues + option_number.issues_status + option_number.replay_for_message + option_number.replay_for_memo
   end
   #影响力得分
   def influence(option_number)
@@ -444,8 +444,8 @@ module UserScoreHelper
      option_number.praise_by_one * 4  + option_number.praise_by_two * 6 + option_number.praise_by_three * 8 - option_number.tread * 2 - option_number.tread_by_one * 2 - option_number.tread_by_two * 4 - option_number.tread_by_three * 6
   end
   #项目贡献得分
-  def active(option_number)
+  def project_active(option_number)
-    option_number.changeset * 4 + option_number.document * 4 + option_number.attachment * 4 + option_number.issue_done_ratio * 2 + option_number.post_issue * 4 + option_number.memo * 2
+    option_number.changeset * 4 + option_number.document * 4 + option_number.attachment * 4 + option_number.issue_done_ratio * 2 + option_number.post_issue * 4
   end
 
   #更新发帖数

app/models/course_message.rb

@@ -15,6 +15,8 @@ class CourseMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
       self.message_alls << MessageAll.new(:user_id => self.user_id)
     end
   end
+end

app/models/forge_message.rb

@@ -22,6 +22,8 @@ class ForgeMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
       self.message_alls << MessageAll.new(:user_id => self.user_id)
     end
   end
+end

app/models/memo_message.rb

@@ -12,6 +12,8 @@ class MemoMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
       self.message_alls << MessageAll.new(:user_id => self.user_id)
     end
   end
+end

app/models/news.rb

@@ -121,7 +121,7 @@ class News < ActiveRecord::Base
   # Description 公用表中也要记录
   def act_as_forge_activity
     # 如果是project为空，那么是课程相关的，不需要保存
-    if !self.project.nil?
+    if self.project
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.project.id)
     end

app/models/query.rb

@@ -492,28 +492,29 @@ class Query < ActiveRecord::Base
 
   def project_statement
     project_clauses = []
-    unless project.descendants.blank?
+    # unless project.descendants.blank?
-      if project && !project.descendants.active.empty?
+    #   if project && project.descendants && project.descendants.active && !project.descendants.active.empty?
-        ids = [project.id]
+        # ids = [project.id]
-        if has_filter?("subproject_id")
+        # if has_filter?("subproject_id")
-          case operator_for("subproject_id")
+        #   case operator_for("subproject_id")
-            when '='
+        #     when '='
-              # include the selected subprojects
+        #       # include the selected subprojects
-              ids += values_for("subproject_id").each(&:to_i)
+        #       ids += values_for("subproject_id").each(&:to_i)
-            when '!*'
+        #     when '!*'
-              # main project only
+        #       # main project only
-            else
+        #     else
-              # all subprojects
+        #       # all subprojects
-              ids += project.descendants.collect(&:id)
+        #       ids += project.descendants.collect(&:id)
-          end
+        #   end
-        elsif Setting.display_subprojects_issues?
+        # elsif Setting.display_subprojects_issues?
-          ids += project.descendants.collect(&:id)
+        #   ids += project.descendants.collect(&:id)
-        end
+        # end
-        project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+        # project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
-      elsif project
+      # elsif project
+    if project
         project_clauses << "#{Project.table_name}.id = %d" % project.id
     end
-    end
+    # end
     project_clauses.any? ? project_clauses.join(' AND ') : nil
   end
 

app/models/user_feedback_message.rb

@@ -11,6 +11,8 @@ class UserFeedbackMessage < ActiveRecord::Base
   after_save :add_user_message
 
   def add_user_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
       self.message_alls << MessageAll.new(:user_id => self.user_id)
     end
   end
+end

app/views/layouts/base_tags.html.erb

@@ -19,12 +19,23 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<%= render :partial => 'layouts/base_header'%>
 
 <div id="main" class="">
     <div id="sidebar">
@@ -38,7 +49,6 @@
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
     </div>
-    <%= render :partial => 'layouts/base_footer'%>
 </div>
 </div>
 
@@ -47,6 +57,11 @@
 
 </div>
 </div>
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/users/_course_poll.html.erb

@@ -1,5 +1,6 @@
 <% has_commit = has_commit_poll?(activity.id ,User.current)%>
 <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+<% if has_commit || activity.user_id == User.current %>
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -44,3 +45,4 @@
     <div class="cl"></div>
   </div>
 </div>
+<% end %>

app/views/users/_influence_new_score_index.html.erb

@@ -5,4 +5,4 @@
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.update_issues')%> * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_issues')%> * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_messages')%> * 1 = <%= option_num.memo %> * 2 = <%=  option_num.memo * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= active(option_num) %> </div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= project_active(option_num) %> </div>

app/views/users/_score_new_index.html.erb

@@ -5,8 +5,8 @@
   <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
 <!-- <div>&nbsp;&nbsp;&nbsp;+ <%#= l(:label_user_score_of_influence) %></div> -->
 <div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> +  <%= format("%.2f" , influence(option_num) ).to_i %>
-   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
+   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" ,project_active(option_num)).to_i %></div>
- <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %>
+ <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , project_active(option_num)).to_i) < 0 %>
     <div><%= l(:label_score_less_than_zero) %></div>
     <% else %>
     <div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>

app/views/users/_show_new_score.html.erb

@@ -68,7 +68,7 @@
     </li>
     <li>
       <%= link_to l(:label_user_score_of_active), "javascript:void(0)", :onclick => "show_div('influence_new_score_index')" %> ：
-      <%= format("%.2f" , active(option_num)).to_i %>
+      <%= format("%.2f" , project_active(option_num)).to_i %>
     </li>
   </ul>
 

app/views/users/_user_activities.html.erb

@@ -23,7 +23,7 @@
                     target.show();
                 }else{
                     btn.data('init',0);
-                    btn.html('点击展开更多回复('+btn.data('count')+')');
+                    btn.html('展开更多('+btn.data('count')+')');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();

app/views/users/resource_search.js.erb

@@ -1,3 +1,5 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);

db/migrate/20150906025009_forge_activitues_date.rb

@@ -0,0 +1,25 @@
+class ForgeActivituesDate < ActiveRecord::Migration
+  def up
+    forge_count = ForgeActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... forge_count do i
+      ForgeActivity.page(i).per(30).each do |activity|
+        unless activity.forge_act_type == "ProjectCreateInfo"
+          if activity.forge_act
+            unless activity.forge_act.project
+              # puts activity.id
+              activity.destroy
+            end
+          else
+            # puts activity.id.to_s + "----"
+            activity.destroy
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150906083453_delete_anonymous_jour.rb

@@ -0,0 +1,15 @@
+class DeleteAnonymousJour < ActiveRecord::Migration
+  def up
+    jour_count = Journal.all.count / 30 + 2
+    transaction do
+      for i in 1 ... jour_count do i
+      Journal.page(i).per(30).each do |jour|
+        jour.destroy if jour.user_id == 2
+      end
+      end
+    end
+  end
+
+  def down
+  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 => 20150829070453) do
+ActiveRecord::Schema.define(:version => 20150906083453) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1296,11 +1296,11 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
-    t.integer  "homework_test_id"
-    t.integer  "result"
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
-    t.text     "error_msg"
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
   end
 
   create_table "student_works", :force => true do |t|
@@ -1317,6 +1317,7 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
+    t.integer  "system_score"
   end
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1534,7 +1535,6 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

public/stylesheets/nyan.css

@@ -210,7 +210,7 @@ span[id^=valid_user] {
 p.jRatingInfos {
     position: absolute;
     z-index: 9999;
-    background: transparent url('bg_jRatingInfos.png') no-repeat;
+    /*background: transparent url('bg_jRatingInfos.png') no-repeat;*/
     color: #CACACA;
     display: none;
     width: 91px;