Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	config/initializers/resque.rb

app/assets/javascripts/inc/search.js

@@ -4,33 +4,45 @@
 
 //extended jquery to search fast.
 $.extend($.expr[':'], {
-	'containsi': function (elem, i, match, array) {
-		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
-	}
+    'containsi': function (elem, i, match, array) {
+        return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+    }
 });
 var interval,sval;
 $(document).ready(function(){
-	$("#user_filter").keyup(function(e){
-		if((e.which>96 && e.which<123) || (e.which>64 && e.which<92) || (e.which == 32) || (e.which == 8)){ 
-			sval = $(this).val();
-			$(".checkbox").popover("hide");
-			$("div.checkblock").hide();
-			clearInterval(interval);
-			interval = setInterval(waitForSearch,1000);
-		}
-	})
+    $("#user_filter").keyup(function(e){
+        if((e.which>96 && e.which<123) || (e.which>64 && e.which<92) || (e.which == 32) || (e.which == 8)){ 
+            sval = $(this).val();
+            $(".checkbox").popover("hide");
+            $("div.checkblock").hide();
+            clearInterval(interval);
+            interval = setInterval(waitForSearch,1000);
+        }
+    })
 })
 var waitForSearch = function(){
-	if(sval){
-		var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
-		if(totalfoundbyname!=0){
-			$("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();				
-		}else if(totalfoundbyname==0){
-			$("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
-		}	
-	}else{
-		$(".checkbox").popover('hide');	
-		$("div.checkblock").show();
-	}
-	clearInterval(interval);
+    if(sval){
+        var re1 = new RegExp("^[\u4E00-\uFA29]*$"); //Chinese character range 
+        var re2 = new RegExp("^[\uE7C7-\uE7F3]*$");
+        if ((re1.test(sval) && (re2.test(sval)))){
+
+            var totalfoundbyname = $("div#users_checkbox_ary label.member-name:contains("+sval+")").length
+            if(totalfoundbyname!=0){
+                $("div#users_checkbox_ary label.member-name:contains("+sval+")").parent().parent().show();                
+            }else if(totalfoundbyname==0){
+                $("div#users_checkbox_ary div.for_unit:contains("+sval+")").parent().show();
+            }
+        }else{
+            var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
+            if(totalfoundbyname!=0){
+                $("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();                
+            }else if(totalfoundbyname==0){
+                $("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
+            }
+        }    
+    }else{
+        $(".checkbox").popover('hide');    
+        $("div.checkblock").show();
+    }
+    clearInterval(interval);
 }

app/controllers/admin/object_auths_new_interface_controller.rb

@@ -6,7 +6,7 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   def setting
     @sys_users = User.all(conditions: {admin: false}).includes(:avatar)
     @ob_auth = ObjectAuth.find params[:object_auth_id]
-    @options_from_collection_for_select_ob_auth = [@ob_auth].collect{|oa| [oa.auth_obj.pp_object,oa.id] }
+    @options_from_collection_for_select_ob_auth = @ob_auth.siblings.collect{|oa| [oa.auth_obj.pp_object,oa.id] }
     @users_array = @ob_auth.privilege_users rescue []
 
     respond_to do |format|
@@ -73,7 +73,6 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   end
 
   def setup_vars
-    # binding.pry
     if request.env['HTTP_REFERER'].split('/')[4]  == "object_auths"
       @app_key = params[:app_key]
     else

app/models/object_auth.rb

@@ -5,6 +5,10 @@ class ObjectAuth  < PrototypeAuth
   after_save :check_user_has_app_auth
   # > - Something.find_with_auth(query)
   # > - or Something.find(query).auth
+  def siblings
+    ObjectAuth.where({obj_authable_type: obj_authable_type,title: title})
+  end
+
   def auth_obj
     class_obj = eval(self.obj_authable_type)
     class_obj.find self.obj_authable_id

app/views/admin/object_auths_new_interface/setting.html.erb

@@ -45,13 +45,8 @@ $(document).ready(function() {
 		}
 	});
    
-	$('#category_id').change(function() {
-		$.ajax({
-			type: 'GET',
-			dataType: "script",
-			url:$(this).parents("from").attr("href"),
-			data:$(this).parents("form").serialize()
-		});
+	$('#ob_auth_id').change(function() {
+          window.location.href = "/admin/object_auths/"+$(this).val()+"/new_interface?app_key="+$("#app_key").val();
 	});
 });
 </script>