Merge branch 'develop' into szzh

Conflicts:
	config/routes.rb

app/controllers/repositories_controller.rb

@@ -122,8 +122,8 @@ class RepositoriesController < ApplicationController
     if project.save
       r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
       m = Member.new(:user => User.current, :roles => [r])
-      if ProjectScore.where("project_id=?", @project.id).first.nil?
+      if ProjectScore.where("project_id=?", project.id).first.nil?
-        ProjectScore.create(:project_id => @project.id, :score => false)
+        ProjectScore.create(:project_id => project.id, :score => false)
       end
       project_info = ProjectInfo.new(:user_id => User.current.id, :project_id => project.id)
       user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => project.id)

app/views/files/_org_subfield_list.html.erb

@@ -17,6 +17,7 @@
                <span class="img_private ml5">私有</span>
             <%end %>
           </span>
+          <br/>
         </div>
         <div class="mt5">
           <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>

app/views/files/_subfield_files.html.erb

@@ -50,7 +50,7 @@
     <div>
       <div class="re_con_top">
         <div class="files_tag" id="files_tag">
-          <%#= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
+          <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
         </div>
         <div class="cl"></div>
         <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count %></span>&nbsp;个资源</p>

app/views/files/create.js.erb

@@ -60,9 +60,9 @@ $('#upload_file_div').slideToggle('slow');
             $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
             //    添加文件上传成功提示,
             <% unless params[:attachments].nil? %>
-                var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+//                var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-                $("#org_subfield_list").prepend(div);
+//                $("#org_subfield_list").prepend(div);
-                setTimeout( function(){div.remove();},3000);
+//                setTimeout( function(){div.remove();},3000);
             <% end %>
        <% end %>
   <% end %>

app/views/organizations/_subfield_list.html.erb

@@ -28,9 +28,15 @@
       <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
       <li class="orgListUser hidden">
-        <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+        <% if @organization.domain %>
-          <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+            <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
-        </div>
+              <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+            </div>
+        <% else %>
+            <div id="sub_dir_show_<%= field.id %>" >
+              <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+            </div>
+        <% end %>
         <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
           <input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
         </div>

app/views/organizations/setting.html.erb

@@ -54,13 +54,13 @@
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_desc_hint"></div>
-        <div class="orgRow mb10"><span class="ml10">组织URL：</span>
+        <!--<div class="orgRow mb10"><span class="ml10">组织URL：</span>-->
-          <div class="w607 fr">http：//
+          <!--<div class="w607 fr">http：//-->
-            <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
+            <!--<input type="text" name="organization[domain]" id="domain" value="<%#= @organization.domain%>" class="orgUrlInput" />-->
-            .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
+            <!--.trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%#= @organization.id %>,$('#domain').val());">申请</a>-->
-            <p class="c_green f12" id="apply_hint" ></p></div>
+            <!--<p class="c_green f12" id="apply_hint" ></p></div>-->
-          <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
+          <!--&lt;!&ndash;class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 &ndash;&gt;-->
-        </div>
+        <!--</div>-->
         <div class="cl"></div>
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
@@ -115,15 +115,15 @@
             <p class="fontBlue fb mb5">新增栏目</p>
             <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
                 <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <div class="mb5">
+                <!--<div class="mb5">-->
-                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
+                  <!--<p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>-->
-                  <% if @organization.domain %>
+                  <!--<%# if @organization.domain %>-->
-                    <span class="fl"><%= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                    <!--<span class="fl"><%#= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">-->
-                  <% else %>
+                  <!--<%# else %>-->
-                      <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                      <!--<span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>-->
-                  <% end %>
+                  <!--<%# end %>-->
-                  <div class="cl"></div>
+                  <!--<div class="cl"></div>-->
-                </div>
+                <!--</div>-->
                 <ul class="orgAddRole">
                   <li class="fontGrey3 fb mb10">栏目类型</li>
                   <li class="fl mr15">

app/views/tags/update_org_subfield_tag_name.js.erb

@@ -8,4 +8,5 @@
 <% else %>
     $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'files/org_subfield_list',
         :locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}) %>");
+    $("#files_tag").html("<%= j(render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}) %>")
 <% end %>

db/migrate/20160114131753_default_changeset.rb

@@ -0,0 +1,9 @@
+class DefaultChangeset < ActiveRecord::Migration
+  def up
+    pss = ProjectScore.where("changeset_num is ?", nil)
+    pss.update_all(:changeset_num => false)
+  end
+
+  def down
+  end
+end

db/migrate/20160115023749_update_boards_attach.rb

@@ -0,0 +1,32 @@
+class UpdateBoardsAttach < ActiveRecord::Migration
+  def up
+    project_count = Project.all.count / 30 + 2
+    transaction do
+      for i in 1 ... project_count do i
+      Project.page(i).per(30).each do |project|
+        puts project.id
+        if ProjectScore.where("project_id=?", project.id).first.nil?
+          puts "create project ==>#{project.id}"
+          ProjectScore.create(:project_id => project.id, :score => false)
+        end
+        unless project.project_score.nil?
+          # update boards
+          unless project.boards.first.nil?
+            boards_count = project.boards.first.topics.count
+            project.project_score.update_attribute(:board_num, boards_count)
+          end
+          # update attach
+          unless project.attachments.nil?
+            attachments_count = project.attachments.count
+            project.project_score.update_attribute(:attach_num, attachments_count)
+          end
+
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end