Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/org_document_comments_controller.rb

@@ -11,10 +11,17 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id)
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
+    if params[:field_id]
+      @org_document_comment.org_subfield_id = params[:field_id].to_i
+    end
     if @org_document_comment.save
       flash.keep[:notice] = l(:notice_successful_create)
       EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
-      redirect_to organization_org_document_comments_path(@organization)
+      if params[:field_id]
+        redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+      else
+        redirect_to organization_org_document_comments_path(@organization)
+      end
     else
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
     end
@@ -46,7 +53,7 @@ class OrgDocumentCommentsController < ApplicationController
           if params[:flag].to_i == 1
             redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
           else
-            redirect_to organization_path(@org_document.organization.id)
+            redirect_to organization_path(@org_document.organization.id, :org_subfield_id => params[:org_subfield_id])
           end
         end
       }

app/controllers/org_subfields_controller.rb

@@ -3,7 +3,7 @@ class OrgSubfieldsController < ApplicationController
     @subfield = OrgSubfield.create(:name => params[:name])
     @organization = Organization.find(params[:organization_id])
     @organization.org_subfields << @subfield
-    @subfield.update_attributes(:priority => @subfield.id)
+    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
   end
 
   def destroy

app/controllers/organizations_controller.rb

@@ -68,29 +68,35 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
-      project_ids = @organization.projects.map(&:id) << 0
-      course_ids = @organization.courses.map(&:id) << 0
-      course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-      case params[:type]
-        when nil
-          @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                             "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
-                                             "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
-                                             @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'project_issue'
-          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'project_message'
-          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'org'
-          @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'course_homework'
-          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'course_news'
-          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'course_message'
-          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
-        when 'course_poll'
-          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+      if params[:org_subfield_id]
+        @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+        @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+        @org_activities = OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})").order('updated_at desc').page(params[:page] || 1).per(10)
+      else
+        project_ids = @organization.projects.map(&:id) << 0
+        course_ids = @organization.courses.map(&:id) << 0
+        course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+        case params[:type]
+          when nil
+            @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
+                                                     "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                                     "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+                                                 @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'project_issue'
+            @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'project_message'
+            @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'org'
+            @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'course_homework'
+            @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'course_news'
+            @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'course_message'
+            @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+          when 'course_poll'
+            @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        end
       end
       @page = params[:page]
       respond_to do |format|

app/models/org_subfield.rb

@@ -1,3 +1,4 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
+  has_many :org_document_comments, :dependent => :destroy
 end

app/views/org_document_comments/destroy.js.erb

@@ -1,2 +1,3 @@
 //location.reload();
-window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'
+//window.location.href = '<%#= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'
+window.location.reload();

app/views/org_document_comments/edit.html.erb

@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 <div>
-<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag),:method => 'put', :id => 'new_org_document_form' do |f| %>
+<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
     <div class="resources">
       <div>
         <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />

app/views/org_document_comments/new.html.erb

@@ -1,24 +1,37 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
 <script>
-  function check_org_title(title)
-  {
-      if($("#document_title").val().trim() == "")
-      {
-          $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
-      }
-      else
-      {
-          $("#doc_title_hint").hide();
-      }
-  }
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_org_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        location.href = document.referrer;
+    }
 </script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
+<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
 <div class="resources">
       <div>
-        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题"></textarea>
+        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>
       </div>
       <div id="doc_title_hint"></div>
-    <div id="org_document_editor" class="mt15" style="display: none">
+    <div id="org_document_editor" class="mt15" >
       <div class="mt10">
         <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
       </div>
@@ -29,9 +42,9 @@
       <div class="cl"></div>
 
       <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="org_document_description_editor.sync();$('#new_org_document_form').submit();">确定</a>
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
             <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="$('#org_document_editor').hide(); $('#doc_title_hint').hide();" class="fr mr10 mt3">取消</a>
+            <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
         <div class="cl"></div>
       </div>
 

app/views/org_subfields/create.js.erb

@@ -1,4 +1,5 @@
 $("#org_subfield_list").html("");
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
 $("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#subfield_name").val("");

app/views/organizations/_org_activities.html.erb

@@ -22,7 +22,7 @@
                 </div>
             <% end %>
             <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
-                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %>
+                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'Project' %>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -25,8 +25,8 @@
 </div>
 <% organization.org_subfields.each do |field| %>
     <div class="homepageLeftMenuBlock">
-      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
-      <%=link_to "", :title => "关联#{field.name}"%>
+      <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+      <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
     </div>

app/views/organizations/_show_org_document.html.erb

@@ -8,7 +8,7 @@
         <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
-            <span style="color:#269ac9;">组织文章</span>
+            <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
       </div>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
       <div class="homepagePostDate">
@@ -27,12 +27,12 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
                         <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => params[:org_subfield_id] ), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',

app/views/organizations/set_homepage.js.erb

@@ -1,2 +1,2 @@
 //location.reload();
-window.location.href ='<%= organization_path(@org)%>'
+window.location.href ='<%= organization_path(@org, :show_homepage => params[:show_homepage])%>';

app/views/organizations/setting.html.erb

@@ -114,7 +114,18 @@
             <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 mb20" />
-                <div class="cl"></div>
+            <ul class="orgAddRole">
+              <li class="fontGrey3 fb mb10">栏目类型</li>
+              <li>
+                <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+                <label for="orgMng">帖子</label>
+              </li>
+              <li>
+                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                <label for="orgMeb">资源</label>
+              </li>
+            </ul>
+            <div class="cl"></div>
             <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
             <% end %>
           </div>

app/views/organizations/show.html.erb

@@ -14,45 +14,47 @@
 </style>
 <% if params[:show_homepage].nil? %>
 <div class="homepageRightBanner">
-  <div class="NewsBannerName">最新动态</div>
-  <ul class="resourcesSelect">
-    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType">
-        <li>
-          <ul class="homepagePostTypeHomework fl">
-            <li class="f14">课程动态</li>
-            <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-              <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-            <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-            <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-            <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-          </ul>
-        </li>
-        <li>
-          <ul class="homepagePostTypeProject fl">
-            <li class="f14">项目动态</li>
-            <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-            <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-          </ul>
-        </li>
-        <li>
-          <ul class="homepagePostTypeProject fl">
-            <li class="f14">更多</li>
-            <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-            <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+  <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+  <% if params[:org_subfield_id].nil? %>
+      <ul class="resourcesSelect">
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+          <ul class="homepagePostType">
+            <li>
+              <ul class="homepagePostTypeHomework fl">
+                <li class="f14">课程动态</li>
+                <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                  <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+              </ul>
+            </li>
+            <li>
+              <ul class="homepagePostTypeProject fl">
+                <li class="f14">项目动态</li>
+                <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+                  <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+              </ul>
+            </li>
+            <li>
+              <ul class="homepagePostTypeProject fl">
+                <li class="f14">更多</li>
+                <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+              </ul>
+            </li>
           </ul>
         </li>
       </ul>
-    </li>
-  </ul>
+  <% end %>
 </div>
 <% end %>
-<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
+<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
     <script>
         $(function() {
             init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%");

db/migrate/20151208073241_add_subfield_to_document.rb

@@ -0,0 +1,5 @@
+class AddSubfieldToDocument < ActiveRecord::Migration
+  def change
+    add_column :org_document_comments, :org_subfield_id, :integer
+  end
+end

db/migrate/20151209085900_add_type_to_org_subfields.rb

@@ -0,0 +1,5 @@
+class AddTypeToOrgSubfields < ActiveRecord::Migration
+  def change
+    add_column :org_subfields, :field_type, :string
+  end
+end

db/migrate/20151209085942_set_type_for_org_subfields.rb

@@ -0,0 +1,10 @@
+class SetTypeForOrgSubfields < ActiveRecord::Migration
+  def up
+    OrgSubfield.all.each do |field|
+      field.update_attribute(:field_type, "Post")
+    end
+  end
+
+  def down
+  end
+end

public/assets/kindeditor/kindeditor.js

@@ -4186,6 +4186,7 @@ _extend(KUploadButton, {
 			(options.form ? '</div>' : '</form>'),
 			'</div>'].join('');
 		var div = K(html, button.doc);
+		$(div).hide()// 如果 以后要用根据 http://kindeditor.net/docs/uploadbutton.html#k-uploadbutton-options来使用uploadButton,那么这里的button会 是隐藏的
 		button.hide();
 		button.before(div);
 		self.div = div;