Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

app/controllers/application_controller.rb

@@ -770,6 +770,7 @@ class ApplicationController < ActionController::Base
   end
 
   def api_request?
+    return false if params[:controller] == 'at'
     %w(xml json).include? params[:format]
   end
 

app/controllers/courses_controller.rb

@@ -442,10 +442,14 @@ class CoursesController < ApplicationController
     @course = cs.create_course(params,User.current)[:course]
     if params[:copy_course]
       copy_course = Course.find params[:copy_course].to_i
-      @course.is_copy = 1
+      @course.is_copy = params[:copy_course].to_i
       @course.open_student = copy_course.open_student
       @course.publish_resource = copy_course.publish_resource
       @course.save
+
+      #copy avatar
+      copy_avatar(@course, copy_course)
+
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|

app/helpers/application_helper.rb

@@ -67,7 +67,7 @@ module ApplicationHelper
   # 获取项目/课程总分
   # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分
   def static_project_score obj
-    score = obj.issue_num * 4 + obj.issue_journal_num + obj.changeset_num * 4 + obj.board_num * 2 + obj.board_message_num + obj.news_num + obj.attach_num * 5
+    score = obj.issue_num * 4 + obj.issue_journal_num + (obj.changeset_num||0) * 4 + obj.board_num * 2 + obj.board_message_num + obj.news_num + obj.attach_num * 5
   end
 
  # 获取组织成员中文名字

app/helpers/avatar_helper.rb

@@ -2,8 +2,23 @@ module AvatarHelper
   
   AVATAR_SIZE="50x50"
 
-  def avatar_image(source)
+  def copy_avatar(des, src)
-    File.join(relative_path, avatar_directory(source.class), source.id.to_s) 
+    src_file = disk_filename(src.class,src.id)
+    des_file = disk_filename(des.class,des.id)
+
+    FileUtils.cp(src_file, des_file) if File.exist?(src_file)
+  end
+  
+  def avatar_image(source, copyed=false)
+    source_type = source.class
+    source_id = source.id
+
+    course = Course.find(source_id) rescue nil
+    if course && copyed
+      source_id  = course.is_copy
+    end
+
+    File.join(relative_path, avatar_directory(source_type), source_id.to_s)
   end
      
   def relative_path
@@ -26,6 +41,17 @@ module AvatarHelper
     File.join(storage_path,avatar_directory(source_type),avatar_filename(source_id,image_file))
   end
 
+  def copy_course?(source_type, source_id)
+    file= disk_filename(source_type, source_id)
+    if source_type == Course && !File.exist?(file)
+      course = Course.find(source_id) rescue nil
+      if course && course.is_copy>0
+        return true
+      end
+    end
+    false
+  end
+  
   def file_extension(filename=nil)
     $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
   end
@@ -35,7 +61,9 @@ module AvatarHelper
       return File.join(relative_path,'AnonymousUser','0')      
     end
     if source.class && source.id && File.exist?(disk_filename(source.class,source.id))
-      avatar_image(source)
+      avatar_image(source, false)
+    elsif copy_course?(source.class, source.id)
+      avatar_image(source, true)
     else
       File.join(relative_path,avatar_directory(source.class),'0')
     end

app/models/course_activity.rb

@@ -72,7 +72,7 @@ class CourseActivity < ActiveRecord::Base
       # message的status状态为0为正常，为1表示创建课程时发送的message
       message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
       # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
-      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1)
+      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1) if message.course_acts.first
     end
   end
 end

app/views/courses/_copy_course.html.erb

@@ -39,12 +39,13 @@
     <input name="copy_course" value="<%=@course.id %>" style="display: none"/>
     <li class="ml45 mb10">
       <a href="javascript:void(0)" class="upimg fl">
-        <%= image_tag(url_to_avatar(@new_course), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
+        <%= image_tag(url_to_avatar(@course), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
       </a> <!--<a href="javascript:void(0)" class="upbtn fl ml30" onclick="$('#upload_course_logo').click();">上传图片</a>-->
       <!--</span>-->
       <div class="cl"></div>
     </li>
     <li class="ml45">
+
       <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
       <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>

app/views/issues/add_journal.js.erb

@@ -2,7 +2,7 @@
     $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
     $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
     $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
-    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%=@issue.class.name%>");
     issue_desc_editor = KindEditor.create('#issue_description',
         {"width":"85%",
             "resizeType":0,
@@ -18,7 +18,7 @@
             "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
     $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
-    sd_create_editor_from_data(<%= @issue.id %>, null, "100%");
+    sd_create_editor_from_data(<%= @issue.id %>, null, "100%","<%=@issue.class.name%>");
 <%else%>
     $("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
    init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');

app/views/issues/add_reply.js.erb

@@ -1,3 +1,3 @@
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");

app/views/issues/delete_journal.js.erb

@@ -1,3 +1,3 @@
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 $(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");

app/views/issues/reply.js.erb

@@ -2,7 +2,7 @@ if($("#reply_message_<%= @jour.id%>").length > 0) {
     $("#reply_message_<%= @jour.id%>").replaceWith("<%= escape_javascript(render :partial => 'issues/issue_reply_ke_form') %>");
     $(function(){
         $('input[name=quote]').val("<%= raw escape_javascript(@tempContent.html_safe) %>");
-        sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+        sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
     });
 }else if($("#reply_to_message_<%= @issue.id%>").length >0) {
     $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");

app/views/issues/update.js.erb

@@ -5,7 +5,7 @@ $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/e
 $("#issue_detail").show();
 $("#issue_edit").hide();
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
 $(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',

app/views/words/create_reply.js.erb

@@ -1,7 +1,7 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
         $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "JournalsForMessage");
     <% else %>
         <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
             $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>");

config/initializers/elasticsearch_dev_patch.rb

@@ -0,0 +1,53 @@
+#coding=utf-8
+
+# elasticsearch 在开发环境下也要打开,很烦人的
+
+if Rails.env.development?
+
+  require 'elasticsearch/model'
+  module Elasticsearch
+    module Model
+      class NoObject
+
+        instance_methods.each do |m|
+          undef_method(m) unless [:object_id, :__send__, :undef_method, :method_missing].include?(m)
+        end
+
+        def method_missing(method, *args, &block)
+          puts "NoObject #{method} #{args}"
+        end
+
+        def NoObject.included(mod)
+          puts "#{self} included in #{mod}"
+        end
+
+        def self.extended(mod)
+          puts "#{self} extended in #{mod}"
+        end
+
+        def initialize
+          puts methods
+        end
+      end
+
+      def self.included(base)
+        base.instance_eval do
+          def settings(a)
+          end
+
+          def __elasticsearch__
+            @__elasticsearch__ ||= NoObject.new
+          end
+        end
+
+        base.class_eval do
+          def __elasticsearch__
+            @__elasticsearch__ ||= NoObject.new
+          end
+        end
+      end
+
+    end
+  end
+
+end

config/initializers/subdomain.rb

@@ -1,9 +1,30 @@
 class Subdomain
 
+  def initialize(opt={})
+    @opt = {}.merge(opt)
+  end
+
   def matches?(request)
-    o = Organization.where(domain: request.subdomain).first
+    puts request.path_parameters
-    request.path_parameters[:id] = o.id if o
+    o = Secdomain.where(subname: request.subdomain).first
-    !o.nil?
+
+    if(@opt[:sub])
+      if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news'
+        request.path_parameters[:id] = o.pid
+        request.path_parameters[:controller] = 'org_subfields'
+        request.path_parameters[:action] = 'show'
+        return true
+      end
+    end
+
+
+    if o && o.controller
+      request.path_parameters[:id] = o.pid
+      request.path_parameters[:controller] = o.controller
+      request.path_parameters[:action] = o.action
+      return true
+    end
+    false
   end
 
 end

config/routes.rb

@@ -31,6 +31,15 @@ RedmineApp::Application.routes.draw do
   # Enable Grack support
   # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post]
 
+  constraints(Subdomain.new) do
+    get '/', to: 'organizations#show'
+  end
+
+  constraints(Subdomain.new(sub: true)) do
+    get '/:sub_dir_name', to: 'fake#fake'
+  end
+
+
   resources :shield_activities do
     collection do
       delete 'show_acts'
@@ -76,16 +85,7 @@ RedmineApp::Application.routes.draw do
   end
 
 
-  constraints(Subdomain.new) do
-    get '/', to: 'organizations#show'
-  end
-  get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'}
-  get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}
-  get '/', to: 'organizations#show', defaults: { id: 1 }, constraints: {subdomain: 'team'}
 
-  get '/', to: 'users#show', defaults: {id: 7}, constraints: {subdomain: 'whm'}
-  get '/', to: 'users#show', defaults: {id: 5}, constraints: {subdomain: 'yg'}
-  get '/', to: 'users#show', defaults: {id:11}, constraints: {subdomain: 'wt'}
 
   resources :org_member do
     member do

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160128024452) do
+ActiveRecord::Schema.define(:version => 20160202034530) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1373,7 +1373,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end
@@ -1535,6 +1534,15 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
     t.string   "pinyin"
   end
 
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
   create_table "seems_rateable_cached_ratings", :force => true do |t|
     t.integer  "cacheable_id",   :limit => 8
     t.string   "cacheable_type"