From afcc7847977891f93072bd4745508986c983f6b7 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Sat, 4 Apr 2015 12:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jperm/models.py                     |  2 +-
 jumpserver.conf                     | 10 +++---
 templates/jperm/dept_perm_edit.html | 47 +++++++++++++++++++++++++++--
 3 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/jperm/models.py b/jperm/models.py
index 519657c76..0d1b276a0 100644
--- a/jperm/models.py
+++ b/jperm/models.py
@@ -33,7 +33,7 @@ class SudoPerm(models.Model):
     comment = models.CharField(max_length=30, null=True, blank=True)
 
     def __unicode__(self):
-        return self.user_group.name        return self.name
+        return self.user_group.name
 
 
 class Apply(models.Model):
diff --git a/jumpserver.conf b/jumpserver.conf
index 95250fbea..099bd2bd9 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -9,10 +9,10 @@ database = jumpserver
 
 [ldap]
 ldap_enable = 1
-host_url = ldap://192.168.8.230:389
-base_dn = dc=fengxing, dc=com
-root_dn = cn=admin,dc=fengxing,dc=com
-root_pw = 123456
+host_url = ldap://127.0.0.1:389
+base_dn = dc=jumpserver, dc=org
+root_dn = cn=admin,dc=jumpserver,dc=org
+root_pw = secret234
 
 [websocket]
 web_socket_host = 127.0.0.1:3000
@@ -25,4 +25,4 @@ email_host = 'mail.funshion.com'
 email_port = '25'
 email_host_user = 'jkfunshion'
 email_host_password = 'jkmail%'
-email_use_tls = False
\ No newline at end of file
+email_use_tls = False
diff --git a/templates/jperm/dept_perm_edit.html b/templates/jperm/dept_perm_edit.html
index 108e001f9..a96509fb4 100644
--- a/templates/jperm/dept_perm_edit.html
+++ b/templates/jperm/dept_perm_edit.html
@@ -2,6 +2,21 @@
 {% load mytags %}
 {% block content %}
 {% include 'nav_cat_bar.html' %}
+<script>
+function filter_ip(text, noselect, total){
+    alert(text);
+    $("#" + noselect).children().each(
+        function(){
+            $(this).remove();
+        });
+
+    $("#" + total).children().each(function{
+        if  ($(this).text().search(text) != -1){
+            $("#" + noselect).append($(this).clone())
+        }
+        })
+}
+</script>
 
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
@@ -28,6 +43,18 @@
                     </div>
                 </div>
 
+                <select id="assets_total" name="assets" class="form-control m-b" size="12" multiple style="display: none">
+                    {% for asset in assets %}
+                        <option value="{{ asset.id }}">{{ asset.ip }}</option>
+                    {% endfor %}
+                </select>
+
+                <select id="asset_select_total" name="asset_select" class="form-control m-b" size="12"  multiple style="display: none">
+                    {% for asset in asset_select %}
+                    <option value="{{ asset.id }}">{{ asset.ip }}</option>
+                    {% endfor %}
+                </select>
+
                 <div class="ibox-content">
                     <form id="sudoPerm" method="post" class="form-horizontal" action="">
                         {% if error %}
@@ -37,7 +64,6 @@
                             <div class="alert alert-success text-center">{{ msg }}</div>
                         {% endif %}
                         <div class="row">
-
                             <div class="form-group">
                                 <label for="group_name" class="col-sm-2 control-label">部门</label>
                                 <div class="col-sm-8">
@@ -48,6 +74,19 @@
 
                             <div class="hr-line-dashed"></div>
 
+                            <div class="form-group">
+                                <label for="group_name" class="col-sm-2 control-label">过滤</label>
+                                <div class="col-sm-4">
+                                    <input id="noselect" class="form-control" onchange="filter_ip(this.value, 'assets', 'assets_total')">
+                                </div>
+                                <div class="col-sm-1">
+                                </div>
+                                <div id="select" class="col-sm-3">
+                                    <input class="form-control">
+                                </div>
+                            </div>
+
+
                             <div class="form-group">
                                 <label for="" class="col-sm-2 control-label">主机<span class="red-fonts">*</span></label>
                                 <div class="col-sm-4">
@@ -134,7 +173,11 @@ $(document).ready(function(){
         $('#users_selected option').each(function(){
             $(this).prop('selected', true)
         })
-    })
+    });
+
+
+
+
 })
 </script>