Merge branch 'ouyangxuhua' into develop

app/controllers/org_subfields_controller.rb

@@ -11,7 +11,7 @@ class OrgSubfieldsController < ApplicationController
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
               "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
         if SubfieldSubdomainDir.find_by_sql(sql).count == 0
-          SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir])
+          SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])

app/helpers/application_helper.rb

@@ -3058,3 +3058,7 @@ def is_default_field? field
   (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
 end
 
+def host_with_protocol
+  return Setting.protocol + "://" + Setting.host_name
+end
+

app/helpers/org_member_helper.rb

@@ -9,7 +9,7 @@ module OrgMemberHelper
     principals = paginateHelper scope,10
     s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
-      link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true
+      link_to text,  host_with_protocol + "/org_member/org_member_autocomplete?" + parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js').to_query, :remote => true
     }
     s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end

app/views/org_subfields/create.js.erb

@@ -4,7 +4,6 @@
         :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-    $("#subfield_name").val("");
+<% end %>
-<% else %>
+$("#subfield_name").val("");
-    $("#subfield_name").val("");
+$("#sub_dir").val("");
-<% end %>

app/views/organizations/_subfield_list.html.erb

@@ -54,7 +54,7 @@
                 </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;"/>
+              <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
             </div>
           </li>
           <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
@@ -85,6 +85,9 @@
                     url: "/org_subfields/" + field_id + "?name=" + input_value,
                     type: 'put'
                 });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
         }
         $(show_id).show();
         $(edit_id).hide();
@@ -109,6 +112,9 @@
                     url: "/org_subfields/" + field_id + "/update_sub_dir?sub_dir_name=" + input_value,
                     type: 'put'
                 });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
         }
         $(show_id).show();
         $(edit_id).hide();
@@ -128,16 +134,13 @@
     function update_priority(show_id, edit_id, field_id, input_value){
         var re = /^[0-9]*[1-9]*[0-9]$/
         if(re.test(input_value) && $(show_id).html().trim() != input_value.trim() && input_value.trim() != ''){
-            if(confirm("确定修改为" + input_value + "?")){
+            $.ajax({
-                $.ajax({
+                url: "/org_subfields/" + field_id + "/update_priority?priority=" + input_value,
-                    url: "/org_subfields/" + field_id + "/update_priority?priority=" + input_value,
+                type: 'put'
-                    type: 'put'
+            });
-                });
-            }
         }
-        else
+        else{
-        {
+            $(edit_id).children("input").val($(show_id).html().trim());
-            $(edit_id).find("input").val($(show_id).html().trim());
         }
         $(show_id).show();
         $(edit_id).hide();

app/views/organizations/new.html.erb

@@ -30,7 +30,7 @@
         </li>
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
-          <input id="organization_is_public" name="organization[is_public]" onblur="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
+          <input id="organization_is_public" name="organization[is_public]" onclick="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
           <span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）</span>
           <div class="cl"></div>
         </li>

app/views/organizations/setting.html.erb

@@ -60,7 +60,7 @@
         <div style="margin-left: 80px " id="check_desc_hint"></div>
         <div class="orgRow mb10"><span class="ml10">组织URL：</span>
           <div class="w607 fr">http：//
-            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
+            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" onfocus="observe_input_to_lowercase($(this));" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
             <% record = OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first %>
             <% if domain.present? and record.present? and record.content == domain.subname %>
@@ -99,7 +99,7 @@
             <p class="fontBlue fb mb5">添加成员</p>
             <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
-                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
+                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <div id="principals_for_new_member">
                   <%= find_user_not_in_current_org_by_name(@project) %>
                 </div>
@@ -132,9 +132,9 @@
                 <div class="mb5">
                   <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
                   <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
                   <% else %>
-                      <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
                   <% end %>
                   <div class="cl"></div>
                 </div>
@@ -198,12 +198,25 @@
     }
   }
 
-//  $(document).ready(function(){
+  //输入子域名或者二级目录，自动将输入换成小写
-//    if ( $("#is_public").attr("checked") != true){
+  function observe_input_to_lowercase(id){
-//        alert($(this).attr("checked"));
+      $(id).each(function(){
-//        $("#allow_download").attr("checked", false);
+          var $this = $(this);
-//        $("#allow_download").attr("disabled", true);
+          var old_input = $this.val();
-//        $("#allow_down_hint").html("");
+          var check=function(){
-//  }
+              var val = $this.val();
-//  });
+              if ( old_input != val){
+                  $this.val(val.toLowerCase());
+                  old_input = val.toLowerCase();
+              }
+          };
+          var reset = function() {
+              if (timer) {
+                  clearInterval(timer);
+              }
+          };
+          var timer = setInterval(check, 300);
+          $this.bind('blur', reset);
+      });
+  }
 </script>

db/migrate/20160322032610_change_domain_name_to_lowercase.rb

@@ -0,0 +1,14 @@
+class ChangeDomainNameToLowercase < ActiveRecord::Migration
+  def up
+    Secdomain.all.each do |domain|
+      domain.update_attribute(:subname, domain.subname.downcase)
+    end
+
+    SubfieldSubdomainDir.all.each do |dir|
+      dir.update_attribute(:name, dir.name.downcase)
+    end
+  end
+
+  def down
+  end
+end