From e9069f02251ab82fc97475b583d98bd9598eaffd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 12:29:23 +0800
Subject: [PATCH] fix merge bug

---
 app/views/users/_course_file_form.html.erb  | 50 ++++++++---------
 app/views/users/_org_file_form.html.erb     | 62 ++++++++++-----------
 app/views/users/_project_file_form.html.erb | 50 ++++++++---------
 3 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/app/views/users/_course_file_form.html.erb b/app/views/users/_course_file_form.html.erb
index b3eec5288..a1317c1f8 100644
--- a/app/views/users/_course_file_form.html.erb
+++ b/app/views/users/_course_file_form.html.erb
@@ -1,26 +1,26 @@
-<%= form_tag add_exist_file_to_course_user_path(user, :type => type),:remote=>true,:id=>'course_list_form' do %>
-    <div>
-      <%= hidden_field_tag(:send_id, send_id) %>
-      <%= hidden_field_tag(:send_ids, send_ids) %>
-      <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-                <ul class="courseSend">
-                  <li class="" style="display:inline-block">
-                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                  </li>
-                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-                </ul>
-            <% end %>
-        <% end %>
-      </div>
-    </div>
-    <div>
-      <div class="courseSendSubmit">
-        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-      </div>
-      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-    </div>
-    <div class="cl"></div>
+<%= form_tag add_exist_file_to_course_user_path(user, :type => defined? type ? "6" : type ),:remote=>true,:id=>'course_list_form' do %>
+    <div>
+      <%= hidden_field_tag(:send_id, send_id) %>
+      <%= hidden_field_tag(:send_ids, send_ids) %>
+      <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+                <ul class="courseSend">
+                  <li class="" style="display:inline-block">
+                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+                  </li>
+                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+                </ul>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div>
+      <div class="courseSendSubmit">
+        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+      </div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+    </div>
+    <div class="cl"></div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
index 8b6c24e50..a69e71384 100644
--- a/app/views/users/_org_file_form.html.erb
+++ b/app/views/users/_org_file_form.html.erb
@@ -1,32 +1,32 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => type),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless orgs.empty? %>
-            <% orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => defined? type ? "6" : type),:remote=>true,:id=>'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org|%>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
+                    <span><%= org.name%></span></label>
+                </li>
+            <%end%>
+        <%end%>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
 <%end %>
\ No newline at end of file
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 2b4772124..134d837a6 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -1,25 +1,25 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => type), :remote => true, :id => 'projects_list_form' %>
-<div>
-  <%= hidden_field_tag(:send_id, send_id) %>
-  <%= hidden_field_tag(:send_ids, send_ids) %>
-  <div class="courseReferContainer">
-    <% if !projects.empty? %>
-        <% projects.each do |project| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= project.name %></li>
-            </ul>
-        <% end %>
-    <% end %>
-  </div>
-</div>
-<div>
-  <div class="courseSendSubmit">
-    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
-  </div>
-  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-</div>
-<div class="cl"></div>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => defined? type ? "6" : type), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>