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

app/decorators/tiding_decorator.rb

@@ -98,7 +98,7 @@ module TidingDecorator
   end
 
   def apply_add_schools_content
-    name = container.name
+    name = ApplyAddSchool.find_by(id: container_id)&.name
     if tiding_type == 'Apply'
       I18n.t(locale_format(tiding_type)) % name
     elsif status == 2
@@ -201,7 +201,7 @@ module TidingDecorator
     when 'Issue' then
       I18n.t(locale_format(parent_container_type)) % parent_container.subject
     when 'Journal' then
-      message = object.notes.present? ? '：' + message_content_helper(parent_container.notes) : ''
+      message = parent_container&.notes.present? ? '：' + message_content_helper(parent_container.notes) : ''
       I18n.t(locale_format(parent_container_type)) % message
     end
   end
@@ -331,13 +331,17 @@ module TidingDecorator
   end
 
   def challenge_work_score_content
+    I18n.t(locale_format) % container&.comment
+  end
+
+  def student_works_scores_appeal_content
     work = StudentWork.find_by(id: parent_container_id)
-    return if work.blank?
+    name = work&.homework_common&.name
 
     if parent_container_type == 'StudentWork'
-      I18n.t(locale_format(parent_container_type, tiding_type)) % work.homework_common.try(:name)
-    elsif parent_container_type == 'UserAppealResult' || parent_container_type == 'AppealResult'
-      I18n.t(locale_format(parent_container_type, status)) % work.homework_common.try(:name)
+      I18n.t(locale_format(parent_container_type, tiding_type)) % name
+    else
+      I18n.t(locale_format(parent_container_type, status)) % name
     end
   end
 
@@ -349,7 +353,7 @@ module TidingDecorator
     if tiding_type == 'System'
       I18n.t(locale_format(tiding_type, status), reason: extra) % container.try(:title)
     else
-      I18n.t(locale_format) % container.try(:title)
+      I18n.t(locale_format(tiding_type)) % container.try(:title)
     end
   end
 

app/models/journal.rb

@@ -0,0 +1,4 @@
+class Journal < ApplicationRecord
+  belongs_to :user
+  belongs_to :issue, foreign_key: :journalized_id
+end

app/models/tiding.rb

@@ -6,4 +6,16 @@ class Tiding < ApplicationRecord
   belongs_to :belong_container, polymorphic: true, optional: true
 
   has_many :attachments, as: :container
+
+  def identifier
+    value = nil
+    if Object.const_defined?(container_type)
+      value = container.try(:identifier)
+    end
+
+    if value.blank? && belong_container_type && Object.const_defined?(belong_container_type)
+      value = belong_container.try(:identifier)
+    end
+    value
+  end
 end

app/views/tidings/_tiding.json.jbuilder

@@ -1,6 +1,6 @@
 json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, :parent_container_id, :parent_container_type
 json.content tiding.content
-json.identifier tiding.try(:container).try(:identifier) rescue nil
+json.identifier tiding.identifier
 json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 

db/migrate/20190729122213_delete_myshixun_games_for_users.rb

@@ -0,0 +1,11 @@
+class DeleteMyshixunGamesForUsers < ActiveRecord::Migration[5.2]
+  def change
+    myshixuns = Myshixun.where("created_at > '2019-07-26 19:00:00' and repo_name is null")
+    myshixuns.find_each do |m|
+      if m.games.count == m.games.select{|g| g.status == 3}.count
+        puts("#######login: #{User.find(m.user_id).login}")
+        m.destroy!
+      end
+    end
+  end
+end

public/react/public/css/edu-all.css

@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 800px;
+    min-width: 785px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

public/react/src/modules/tpm/NewHeader.js

@@ -791,7 +791,7 @@ submittojoinclass=(value)=>{
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
           { user===undefined?
-            <span className="font-15 fr mt17 ml20 mr25">
+            <span className="font-15 fr mt17 ml10 mr25">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>

public/stylesheets/educoder/edu-all.css

@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 800px;
+    min-width: 785px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;