From 74ab311d3e40174ab74bfae684f5503d9c09dc29 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 9 Oct 2019 16:49:36 +0800
Subject: [PATCH 01/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9ldap?=
 =?UTF-8?q?=E5=92=8Ccommand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/api.py                           | 17 ++---------------
 apps/settings/utils.py                         | 18 +++++++++++++-----
 .../templates/terminal/command_list.html       | 18 ++++++++++++++++--
 .../templates/terminal/session_detail.html     |  8 ++++++--
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/apps/settings/api.py b/apps/settings/api.py
index 9df77d036..82d483c5e 100644
--- a/apps/settings/api.py
+++ b/apps/settings/api.py
@@ -102,6 +102,7 @@ class LDAPUserListApi(generics.ListAPIView):
         if hasattr(self, 'swagger_fake_view'):
             return []
         util = LDAPUtil()
+
         try:
             users = util.search_user_items()
         except Exception as e:
@@ -112,20 +113,6 @@ class LDAPUserListApi(generics.ListAPIView):
             user['id'] = user['username']
         return users
 
-    def filter_queryset(self, queryset):
-        search = self.request.query_params.get('search')
-        if not search:
-            return queryset
-        search = search.lower()
-        queryset = [
-            q for q in queryset
-            if
-            search in q['username'].lower()
-            or search in q['name'].lower()
-            or search in q['email'].lower()
-        ]
-        return queryset
-
     def sort_queryset(self, queryset):
         order_by = self.request.query_params.get('order')
         if not order_by:
@@ -139,7 +126,7 @@ class LDAPUserListApi(generics.ListAPIView):
         return queryset
 
     def list(self, request, *args, **kwargs):
-        queryset = self.filter_queryset(self.get_queryset())
+        queryset = self.get_queryset()
         queryset = self.sort_queryset(queryset)
         page = self.paginate_queryset(queryset)
         if page is not None:
diff --git a/apps/settings/utils.py b/apps/settings/utils.py
index 657aa4600..fabdb3967 100644
--- a/apps/settings/utils.py
+++ b/apps/settings/utils.py
@@ -81,9 +81,12 @@ class LDAPUtil:
             user_item[attr] = value
         return user_item
 
-    def _search_user_items_ou(self, search_ou, cookie=None):
+    def _search_user_items_ou(self, search_ou, extra_filter=None, cookie=None):
+        search_filter = self.search_filter % {"user": "*"}
+        if extra_filter:
+            search_filter = '(&({})({}))'.format(search_filter, extra_filter)
         ok = self.connection.search(
-            search_ou, self.search_filter % ({"user": "*"}),
+            search_ou, search_filter,
             attributes=list(self.attr_map.values()),
             paged_size=self.paged_size, paged_cookie=cookie
         )
@@ -108,16 +111,21 @@ class LDAPUtil:
             cookie = self.connection.result['controls']['1.2.840.113556.1.4.319']['value']['cookie']
         return cookie
 
-    def search_user_items(self):
+    def search_user_items(self, q=None):
         user_items = []
         logger.info("Search user items")
+        extra_filter = ''
+        if q:
+            for attr in self.attr_map.values():
+                extra_filter += '({}={})'.format(attr, q)
+            extra_filter = '(|{})'.format(extra_filter)
         for search_ou in str(self.search_ougroup).split("|"):
             logger.info("Search user search ou: {}".format(search_ou))
-            _user_items = self._search_user_items_ou(search_ou)
+            _user_items = self._search_user_items_ou(search_ou, extra_filter=extra_filter)
             user_items.extend(_user_items)
             while self._cookie():
                 logger.info("Page Search user search ou: {}".format(search_ou))
-                _user_items = self._search_user_items_ou(search_ou, self._cookie())
+                _user_items = self._search_user_items_ou(search_ou, extra_filter, self._cookie())
                 user_items.extend(_user_items)
         logger.info("Search user items end")
         return user_items
diff --git a/apps/terminal/templates/terminal/command_list.html b/apps/terminal/templates/terminal/command_list.html
index 3580af03f..1fc6f1d76 100644
--- a/apps/terminal/templates/terminal/command_list.html
+++ b/apps/terminal/templates/terminal/command_list.html
@@ -164,11 +164,14 @@ $(document).ready(function () {
             detailRows.push(tr.attr('id'));
         }
     }
-})
+});
 
 
 function format(d) {
     var output = $("<pre style='border: none; background: none'></pre>");
+
+    output.append('$ ', d.input);
+    output.append('\r\n\r\n');
     output.append(d.output);
     return output
 }
@@ -187,6 +190,17 @@ function initTable() {
                 $(td).addClass("toggle");
                 $(td).html("<i class='fa fa-angle-right'></i>");
             }},
+            {targets: 1, createdCell: function (td, cellData) {
+                var data = htmlEscape(cellData);
+                var interHtml = $("<span></span>");
+                if (data.length > 40) {
+                    interHtml.attr('title', data);
+                    data = data.slice(0, 40);
+                    data += ' ...';
+                }
+                interHtml.html(data);
+                $(td).html(interHtml);
+            }},
             {targets: 5, createdCell: function (td, cellData) {
                 var data = '<a href="{% url "terminal:session-detail" pk=DEFAULT_PK %}">{% trans "Goto" %}</a>'
                         .replace('{{ DEFAULT_PK }}', cellData);
@@ -200,7 +214,7 @@ function initTable() {
         toggle: true,
         ajax_url: commandListUrl,
         columns: [
-            {data: "id"}, {data: "input", orderable: false}, {data: "user", orderable: false},
+            {data: "id"}, {data: "input", orderable: false, width: "40%"}, {data: "user", orderable: false},
             {data: "asset", orderable: false}, {data: "system_user", orderable: false},
             {data: "session", orderable: false}, {data: "timestamp", width: "160px", orderable: false},
         ],
diff --git a/apps/terminal/templates/terminal/session_detail.html b/apps/terminal/templates/terminal/session_detail.html
index b54eedec7..9edcaeccf 100644
--- a/apps/terminal/templates/terminal/session_detail.html
+++ b/apps/terminal/templates/terminal/session_detail.html
@@ -54,8 +54,12 @@
                                         {% for command in object_list %}
                                             <tr>
                                                 <td>{{ forloop.counter }}</td>
-                                                <td>{{ command.input }}</td>
-                                                <td><pre style="border: none;background: none">{{ command.output }}</pre></td>
+                                                <td>{{ command.input | truncatechars:40 }}</td>
+                                                <td><pre style="border: none;background: none">
+$ {{ command.input }}
+<br>
+{{ command.output }}
+                                                </pre></td>
                                                 <td>{{ command.timestamp|ts_to_date}}</td>
                                             </tr>
                                         {% empty %}

From e52178811c2f419adf5faffdde63d26e0e3c8d1d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 9 Oct 2019 16:52:38 +0800
Subject: [PATCH 02/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9command?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/templates/terminal/session_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/terminal/templates/terminal/session_detail.html b/apps/terminal/templates/terminal/session_detail.html
index 9edcaeccf..1c96e3ee7 100644
--- a/apps/terminal/templates/terminal/session_detail.html
+++ b/apps/terminal/templates/terminal/session_detail.html
@@ -57,7 +57,7 @@
                                                 <td>{{ command.input | truncatechars:40 }}</td>
                                                 <td><pre style="border: none;background: none">
 $ {{ command.input }}
-<br>
+
 {{ command.output }}
                                                 </pre></td>
                                                 <td>{{ command.timestamp|ts_to_date}}</td>

From c8cade622a94a5eb22c16a2f845e721087cc6daf Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Wed, 9 Oct 2019 18:36:38 +0800
Subject: [PATCH 03/27] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=20LDAP=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5/=E6=90=9C=E7=B4=A2=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/api.py   |  7 ++++---
 apps/settings/utils.py | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/apps/settings/api.py b/apps/settings/api.py
index 82d483c5e..d327bde17 100644
--- a/apps/settings/api.py
+++ b/apps/settings/api.py
@@ -101,10 +101,11 @@ class LDAPUserListApi(generics.ListAPIView):
     def get_queryset(self):
         if hasattr(self, 'swagger_fake_view'):
             return []
-        util = LDAPUtil()
-
+        q = self.request.query_params.get('search')
         try:
-            users = util.search_user_items()
+            util = LDAPUtil()
+            extra_filter = util.construct_extra_filter(util.SEARCH_FIELD_ALL, q)
+            users = util.search_user_items(extra_filter)
         except Exception as e:
             users = []
             logger.error(e)
diff --git a/apps/settings/utils.py b/apps/settings/utils.py
index fabdb3967..9ecd5d286 100644
--- a/apps/settings/utils.py
+++ b/apps/settings/utils.py
@@ -22,6 +22,9 @@ class LDAPOUGroupException(Exception):
 class LDAPUtil:
     _conn = None
 
+    SEARCH_FIELD_ALL = 'all'
+    SEARCH_FIELD_USERNAME = 'username'
+
     def __init__(self, use_settings_config=True, server_uri=None, bind_dn=None,
                  password=None, use_ssl=None, search_ougroup=None,
                  search_filter=None, attr_map=None, auth_ldap=None):
@@ -84,7 +87,8 @@ class LDAPUtil:
     def _search_user_items_ou(self, search_ou, extra_filter=None, cookie=None):
         search_filter = self.search_filter % {"user": "*"}
         if extra_filter:
-            search_filter = '(&({})({}))'.format(search_filter, extra_filter)
+            search_filter = '(&{}{})'.format(search_filter, extra_filter)
+
         ok = self.connection.search(
             search_ou, search_filter,
             attributes=list(self.attr_map.values()),
@@ -111,14 +115,10 @@ class LDAPUtil:
             cookie = self.connection.result['controls']['1.2.840.113556.1.4.319']['value']['cookie']
         return cookie
 
-    def search_user_items(self, q=None):
+    def search_user_items(self, extra_filter=None):
         user_items = []
         logger.info("Search user items")
-        extra_filter = ''
-        if q:
-            for attr in self.attr_map.values():
-                extra_filter += '({}={})'.format(attr, q)
-            extra_filter = '(|{})'.format(extra_filter)
+
         for search_ou in str(self.search_ougroup).split("|"):
             logger.info("Search user search ou: {}".format(search_ou))
             _user_items = self._search_user_items_ou(search_ou, extra_filter=extra_filter)
@@ -130,10 +130,28 @@ class LDAPUtil:
         logger.info("Search user items end")
         return user_items
 
+    def construct_extra_filter(self, field, q):
+        if not q:
+            return None
+        extra_filter = ''
+        if field == self.SEARCH_FIELD_ALL:
+            for attr in self.attr_map.values():
+                extra_filter += '({}={})'.format(attr, q)
+            extra_filter = '(|{})'.format(extra_filter)
+            return extra_filter
+
+        if field == self.SEARCH_FIELD_USERNAME and isinstance(q, list):
+            attr = self.attr_map.get('username')
+            for username in q:
+                extra_filter += '({}={})'.format(attr, username)
+            extra_filter = '(|{})'.format(extra_filter)
+            return extra_filter
+
     def search_filter_user_items(self, username_list):
-        user_items = self.search_user_items()
-        if username_list:
-            user_items = [u for u in user_items if u['username'] in username_list]
+        extra_filter = self.construct_extra_filter(
+            self.SEARCH_FIELD_USERNAME, username_list
+        )
+        user_items = self.search_user_items(extra_filter)
         return user_items
 
     @staticmethod

From ce530e417ccb7942eb2533ccf9e6f91b74d96df1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 9 Oct 2019 19:10:36 +0800
Subject: [PATCH 04/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9cmd=20filter?=
 =?UTF-8?q?=20rules=20pattern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/cmd_filter.py              | 28 +++++++++++--------
 .../ops/command_execution_create.html         |  3 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py
index 38776ff38..91febd40b 100644
--- a/apps/assets/models/cmd_filter.py
+++ b/apps/assets/models/cmd_filter.py
@@ -7,6 +7,7 @@ from django.db import models
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.utils.translation import ugettext_lazy as _
 
+from common.utils import lazyproperty
 from orgs.mixins.models import OrgModelMixin
 
 
@@ -57,25 +58,30 @@ class CommandFilterRule(OrgModelMixin):
     date_updated = models.DateTimeField(auto_now=True)
     created_by = models.CharField(max_length=128, blank=True, default='', verbose_name=_('Created by'))
 
-    __pattern = None
-
     class Meta:
         ordering = ('-priority', 'action')
         verbose_name = _("Command filter rule")
 
-    @property
+    @lazyproperty
     def _pattern(self):
-        if self.__pattern:
-            return self.__pattern
         if self.type == 'command':
             regex = []
-            for cmd in self.content.split('\r\n'):
-                cmd = cmd.replace(' ', '\s+')
-                regex.append(r'\b{0}\b'.format(cmd))
-            self.__pattern = re.compile(r'{}'.format('|'.join(regex)))
+            content = self.content.replace('\r\n', '\n')
+            for cmd in content.split('\n'):
+                cmd = re.escape(cmd)
+                cmd = cmd.replace('\\ ', '\s+')
+                if cmd[-1].isalpha():
+                    regex.append(r'\b{0}\b'.format(cmd))
+                else:
+                    regex.append(r'\b{0}'.format(cmd))
+            s = r'{}'.format('|'.join(regex))
         else:
-            self.__pattern = re.compile(r'{0}'.format(self.content))
-        return self.__pattern
+            s = r'{0}'.format(self.content)
+        try:
+            _pattern = re.compile(s)
+        except:
+            _pattern = ''
+        return _pattern
 
     def match(self, data):
         found = self._pattern.search(data)
diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html
index 19936154f..e0e96f267 100644
--- a/apps/ops/templates/ops/command_execution_create.html
+++ b/apps/ops/templates/ops/command_execution_create.html
@@ -140,6 +140,7 @@
         }
 
         function initTree() {
+            $('#assetTree').html("{% trans 'Loading' %}" + '..');
             if (systemUserId) {
                 url = treeUrl + '&system_user=' + systemUserId
             } else {
@@ -365,4 +366,4 @@
             execute()
         })
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From cea6ea4826590ecd4f15ecd2750a7d6a253ec0a3 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 10 Oct 2019 11:22:09 +0800
Subject: [PATCH 05/27] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=20select2?=
 =?UTF-8?q?=20js/css=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC(4.0.10)?=
 =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E5=9B=9E=E8=B7=B3=E5=88=B0=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/static/css/plugins/select2/select2.min.css    | 2 +-
 apps/static/js/plugins/select2/select2.full.min.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/static/css/plugins/select2/select2.min.css b/apps/static/css/plugins/select2/select2.min.css
index 76de04d92..7c18ad59d 100644
--- a/apps/static/css/plugins/select2/select2.min.css
+++ b/apps/static/css/plugins/select2/select2.min.css
@@ -1 +1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;margin:-1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
diff --git a/apps/static/js/plugins/select2/select2.full.min.js b/apps/static/js/plugins/select2/select2.full.min.js
index 684edf323..313313449 100644
--- a/apps/static/js/plugins/select2/select2.full.min.js
+++ b/apps/static/js/plugins/select2/select2.full.min.js
@@ -1,3 +1,2 @@
-/*! Select2 4.0.3 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.slice(0,n.length-1).concat(a),k=0;k<a.length;k+=1)if(m=a[k],"."===m)a.splice(k,1),k-=1;else if(".."===m){if(1===k&&(".."===a[2]||".."===a[0]))break;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=v.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),n.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var c=r[a];delete r[a],t[a]=!0,m.apply(b,c)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,c,d,f){var h,k,l,m,n,s,u=[],v=typeof d;if(f=f||a,"undefined"===v||"function"===v){for(c=!c.length&&d.length?["require","exports","module"]:c,n=0;n<c.length;n+=1)if(m=o(c[n],f),k=m.f,"require"===k)u[n]=p.require(a);else if("exports"===k)u[n]=p.exports(a),s=!0;else if("module"===k)h=u[n]=p.module(a);else if(e(q,k)||e(r,k)||e(t,k))u[n]=j(k);else{if(!m.p)throw new Error(a+" missing "+k);m.p.load(m.n,g(f,!0),i(k),{}),u[n]=q[k]}l=d?d.apply(q[a],u):void 0,a&&(h&&h.exports!==b&&h.exports!==q[a]?q[a]=h.exports:l===b&&s||(q[a]=l))}else a&&(q[a]=d)},a=c=n=function(a,c,d,e,f){if("string"==typeof a)return p[a]?p[a](c):j(o(a,c).f);if(!a.splice){if(s=a,s.deps&&n(s.deps,s.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?m(b,a,c,d):setTimeout(function(){m(b,a,c,d)},4),n},n.config=function(a){return n(a)},a._defined=q,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(q,a)||e(r,a)||(r[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){var e=b[d];"function"==typeof e&&"constructor"!==d&&c.push(d)}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){var a=Array.prototype.unshift;return a.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;d>c;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;a>c;c++){var d=Math.floor(36*Math.random());b+=d.toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return e!==f||"hidden"!==f&&"visible"!==f?"scroll"===e||"scroll"===f?!0:d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth:!1},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){var c=b.find(".select2-results");c.append(a)},c.prototype.sort=function(a){var b=this.options.get("sorter");return b(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()}),e=b.$results.find(".select2-results__option[aria-selected]");e.each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{"class":"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):0>h-g&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");return"true"===c.attr("aria-selected")?void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{})):void d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){var a=this.$results.find(".select2-results__option--highlighted");return a},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),2>=c?this.$results.scrollTop(0):(g>this.$results.outerHeight()||0>g)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){var a={BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46};return a}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id+"-container",a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2"),e=a(".select2.select2-container--open");e.each(function(){var b=a(this);if(this!=d[0]){var c=b.data("element");c.select2("close")}})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){var c=b.find(".selection");c.append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection"),d=this.options.get("escapeMarkup");return d(c(a,b))},d.prototype.selectionContainer=function(){var b=a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>');return b},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id,d=b.length>1;if(d||c)return a.call(this,b);this.clear();var e=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(e)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||(c.which==b.DELETE||c.which==b.BACKSPACE)&&this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented();var b=a.which;if(b===c.BACKSPACE&&""===e.$search.val()){var d=e.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var f=d.data("data");e.searchRemoveChoice(f),a.preventDefault()}}});var f=document.documentMode,g=f&&11>=f;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){return g?void e.$selection.off("input.search input.searchcheck"):void e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{var b=this.$search.val().length+1;a=.75*b+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){var a={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};return a}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),d+=null!=c.id?"-"+c.id.toString():"-"+a.generateChars(4)},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");
-if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple"))return a.selected=!1,c(a.element).is("option")?(a.element.selected=!1,void this.$element.trigger("change")):void this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this,f=this.$element.children();f.each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(b=c.data(a[0],"data"),null!=b)return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){var c=this.options.get("matcher");return c(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0),k=i.text===b.term;if(k||j)return f?!1:(a.data=g,void c(a))}if(f)return!0;var l=e.createTag(b);if(null!=l){var m=e.option(l);m.attr("data-select2-tag",!0),e.addOptions([m]),e.insertTag(g,l)}a.results=g,c(a)}var e=this;return this._removeOldTags(),null==b.term||null!=b.page?void a.call(this,b,c):void a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){var c=(this._lastTag,this.$element.find("option[data-select2-tag]"));c.each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b),d=g.$element.find("option").filter(function(){return a(this).val()===c.id});if(!d.length){var e=g.option(c);e.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([e])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",b.term.length<this.minimumInputLength?void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength?void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;return d.maximumSelectionLength>0&&f>=d.maximumSelectionLength?void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}}):void a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()&&e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){var b=e.showSearch(a);b?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){var c=e.$results.offset().top+e.$results.outerHeight(!1),d=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1);c+50>=d&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id,h=this.$container.parents().filter(b.hasScroll);h.off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return a(c.data.results)<this.minimumResultsForSearch?!1:b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){var b=a.minimum-a.input.length,c="Please enter "+b+" or more characters";return c},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),(null!=l.tokenSeparators||null!=l.tokenizer)&&(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(O){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(P){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var Q=k.loadPath(this.defaults.amdLanguageBase+"en"),R=new k(l.language);R.extend(Q),l.translations=R}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){var h=e.children[g],i=c(d,h);null==i&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var j=b(e.text).toUpperCase(),k=b(d.term).toUpperCase();return j.indexOf(k)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)};var E=new D;return E}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return 0>=e?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;i>h;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),(null==a||0===a.length)&&(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null;
-},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("select2/compat/utils",["jquery"],function(a){function b(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&(f=d(this),null!=f&&g.push(f))})),b.attr("class",g.join(" "))}return{syncCssClasses:b}}),b.define("select2/compat/containerCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("containerCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptContainerCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("containerCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/dropdownCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("dropdownCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptDropdownCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("dropdownCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/initSelection",["jquery"],function(a){function b(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=c.get("initSelection"),this._isInitialized=!1,a.call(this,b,c)}return b.prototype.current=function(b,c){var d=this;return this._isInitialized?void b.call(this,c):void this.initSelection.call(null,this.$element,function(b){d._isInitialized=!0,a.isArray(b)||(b=[b]),c(b)})},b}),b.define("select2/compat/inputData",["jquery"],function(a){function b(a,b,c){this._currentData=[],this._valueSeparator=c.get("valueSeparator")||",","hidden"===b.prop("type")&&c.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),a.call(this,b,c)}return b.prototype.current=function(b,c){function d(b,c){var e=[];return b.selected||-1!==a.inArray(b.id,c)?(b.selected=!0,e.push(b)):b.selected=!1,b.children&&e.push.apply(e,d(b.children,c)),e}for(var e=[],f=0;f<this._currentData.length;f++){var g=this._currentData[f];e.push.apply(e,d(g,this.$element.val().split(this._valueSeparator)))}c(e)},b.prototype.select=function(b,c){if(this.options.get("multiple")){var d=this.$element.val();d+=this._valueSeparator+c.id,this.$element.val(d),this.$element.trigger("change")}else this.current(function(b){a.map(b,function(a){a.selected=!1})}),this.$element.val(c.id),this.$element.trigger("change")},b.prototype.unselect=function(a,b){var c=this;b.selected=!1,this.current(function(a){for(var d=[],e=0;e<a.length;e++){var f=a[e];b.id!=f.id&&d.push(f.id)}c.$element.val(d.join(c._valueSeparator)),c.$element.trigger("change")})},b.prototype.query=function(a,b,c){for(var d=[],e=0;e<this._currentData.length;e++){var f=this._currentData[e],g=this.matches(b,f);null!==g&&d.push(g)}c({results:d})},b.prototype.addOptions=function(b,c){var d=a.map(c,function(b){return a.data(b[0],"data")});this._currentData.push.apply(this._currentData,d)},b}),b.define("select2/compat/matcher",["jquery"],function(a){function b(b){function c(c,d){var e=a.extend(!0,{},d);if(null==c.term||""===a.trim(c.term))return e;if(d.children){for(var f=d.children.length-1;f>=0;f--){var g=d.children[f],h=b(c.term,g.text,g);h||e.children.splice(f,1)}if(e.children.length>0)return e}return b(c.term,d.text,d)?e:null}return c}return b}),b.define("select2/compat/query",[],function(){function a(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),a.call(this,b,c)}return a.prototype.query=function(a,b,c){b.callback=c;var d=this.options.get("query");d.call(null,b)},a}),b.define("select2/dropdown/attachContainer",[],function(){function a(a,b,c){a.call(this,b,c)}return a.prototype.position=function(a,b,c){var d=c.find(".dropdown-wrapper");d.append(b),b.addClass("select2-dropdown--below"),c.addClass("select2-container--below")},a}),b.define("select2/dropdown/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$dropdown.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("select2/selection/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$selection.on(d.join(" "),function(a){a.stopPropagation()})},a}),function(c){"function"==typeof b.define&&b.define.amd?b.define("jquery-mousewheel",["jquery"],c):"object"==typeof exports?module.exports=c:c(a)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if(b=b||{},"object"==typeof b)return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
+/*! Select2 4.0.10 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(d){var e=function(){if(d&&d.fn&&d.fn.select2&&d.fn.select2.amd)var e=d.fn.select2.amd;var t,n,i,h,o,s,f,g,m,v,y,_,r,a,w,l;function b(e,t){return r.call(e,t)}function c(e,t){var n,i,r,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(i=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(r=(r=f[h.slice(0,d).join("/")])&&r[i]){o=r,a=u;break}if(o)break;!l&&g&&g[i]&&(l=g[i],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function S(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function u(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function D(e){return e?u(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},r=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,i=u(e),r=i[0],o=t[1];return e=i[1],r&&(n=S(r=c(r,o))),r?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return c(e,t)}}(o)):c(e,o):(r=(i=u(e=c(e,o)))[0],e=i[1],r&&(n=S(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,i){var r,o,s,a,l,c,u,d=[],p=typeof n;if(c=D(i=i||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)r=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=S(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(i,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(r&&r.exports!==h&&r.exports!==m[e]?m[e]=r.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,i,r){if("string"==typeof e)return g[e]?g[e](t):S(f(e,D(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=i,i=r),i?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(i=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=i),e.define("almond",function(){}),e.define("jquery",[],function(){var e=d||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var r={};function u(e){var t=e.prototype,n=[];for(var i in t){"function"==typeof t[i]&&"constructor"!==i&&n.push(i)}return n}r.Extend=function(e,t){var n={}.hasOwnProperty;function i(){this.constructor=e}for(var r in t)n.call(t,r)&&(e[r]=t[r]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},r.Decorate=function(i,r){var e=u(r),t=u(i);function o(){var e=Array.prototype.unshift,t=r.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=r.prototype.constructor),n.apply(this,arguments)}r.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=i.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=r.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},r.Observable=e,r.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},r.bind=function(e,t){return function(){e.apply(t,arguments)}},r._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var r=0;r<n.length;r++){var o=n[r];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),r==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},r.hasScroll=function(e,t){var n=o(t),i=t.style.overflowX,r=t.style.overflowY;return(i!==r||"hidden"!==r&&"visible"!==r)&&("scroll"===i||"scroll"===r||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},r.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},r.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},r.__cache={};var n=0;return r.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},r.StoreData=function(e,t,n){var i=r.GetUniqueElementId(e);r.__cache[i]||(r.__cache[i]={}),r.__cache[i][t]=n},r.GetData=function(e,t){var n=r.GetUniqueElementId(e);return t?r.__cache[n]&&null!=r.__cache[n][t]?r.__cache[n][t]:o(e).data(t):r.__cache[n]},r.RemoveData=function(e){var t=r.GetUniqueElementId(e);null!=r.__cache[t]&&delete r.__cache[t],e.removeAttribute("data-select2-id")},r}),e.define("select2/results",["jquery","./utils"],function(h,f){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return f.Extend(i,f.Observable),i.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],r=this.option(i);t.push(r)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,i)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},i.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var r in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[r];t.setAttribute(r,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},i.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var i=n-1;0===e.length&&(i=0);var r=t.eq(i);r.trigger("mouseenter");var o=l.$results.offset().top,s=r.offset().top,a=l.$results.scrollTop()+(s-o);0===i?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var i=t.eq(n);i.trigger("mouseenter");var r=l.$results.offset().top+l.$results.outerHeight(!1),o=i.offset().top+i.outerHeight(!1),s=l.$results.scrollTop()+o-r;0===n?l.$results.scrollTop(0):r<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,i=0<e.deltaY&&t-e.deltaY<=0,r=e.deltaY<0&&n<=l.$results.height();i?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):r&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,i=e.offset().top,r=this.$results.scrollTop()+(i-n),o=i-n;r-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(r)}},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),r=n(e,t);null==r?t.style.display="none":"string"==typeof r?t.innerHTML=i(r):h(t).append(r)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,r){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===r.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function r(){r.__super__.constructor.apply(this,arguments)}return n.Extend(r,t),r.prototype.render=function(){var e=r.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},r.prototype.bind=function(t,e){var n=this;r.__super__.bind.apply(this,arguments);var i=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",i).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},r.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},r.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},r.prototype.selectionContainer=function(){return e("<span></span>")},r.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),i=this.display(t,n);n.empty().append(i);var r=t.title||t.text;r?n.attr("title",r):n.removeAttr("title")}else this.clear()},r}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(r,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var i=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){i.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!i.options.get("disabled")){var t=r(this).parent(),n=l.GetData(t[0],"data");i.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return r('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var i=e[n],r=this.selectionContainer(),o=this.display(i,r);r.append(o);var s=i.title||i.text;s&&r.attr("title",s),l.StoreData(r[0],"data",i),t.push(r)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var i=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(i)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(r,i,a){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.options.get("disabled")){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=a.GetData(n[0],"data"),r=this.$element.val();this.$element.val(this.placeholder.id);var o={data:i};if(this.trigger("clear",o),o.prevented)this.$element.val(r);else{for(var s=0;s<i.length;s++)if(o={data:i[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(r);this.$element.trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),i=r('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(i[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(i)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=i('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),t.on("open",function(){i.$search.attr("aria-controls",r),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search.prop("disabled",!1),i._transferTabIndex()}),t.on("disable",function(){i.$search.prop("disabled",!0)}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===i.$search.val()){var t=i.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");i.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)i.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&i.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var i=this,r=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,r)){t=t||{};var n=s.Event("select2:"+e,{params:t});i.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){if(!(e in i._cache)){var t=n(e);i._cache[e]=t}return new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(i){function n(e,t){n.__super__.constructor.call(this)}return i.Extend(n,i.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=i.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+i.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],i=this;this.$element.find(":selected").each(function(){var e=l(this),t=i.item(e);n.push(t)}),e(n)},n.prototype.select=function(r){var o=this;if(r.selected=!0,l(r.element).is("option"))return r.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(r=[r]).push.apply(r,e);for(var n=0;n<r.length;n++){var i=r[n].id;-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("change")});else{var e=r.id;this.$element.val(e),this.$element.trigger("change")}},n.prototype.unselect=function(r){var o=this;if(this.$element.prop("multiple")){if(r.selected=!1,l(r.element).is("option"))return r.element.selected=!1,void this.$element.trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==r.id&&-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(i,e){var r=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(i,t);null!==n&&r.push(n)}}),e({results:r})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),i=this._normalizeItem(e);return i.element=t,a.StoreData(t,"data",i),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),i=[],r=0;r<n.length;r++){var o=l(n[r]),s=this.item(o);i.push(s)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return f.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(g(this)).id}).get(),r=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,i)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}r.push(p)}}return r},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var i=o.ajax(e);return i.then(t),i.fail(n),i}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,i){var r=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=r.processResults(e,n);r.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),i(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||r.trigger("results:message",{message:"errorLoading"})});r._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var i=n.get("tags"),r=n.get("createTag");void 0!==r&&(this.createTag=r);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(i))for(var s=0;s<i.length;s++){var a=i[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var i=t.results,r=0;r<i.length;r++){var o=i[r],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=i,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(i,a)}t.results=i,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=i.option(t);n.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([n])}!function(e){i.trigger("select",{data:e})}(t)});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var r=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,r)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(i(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var i=this;this.current(function(e){var t=null!=e?e.length:0;0<i.maximumSelectionLength&&t>=i.maximumSelectionLength?i.trigger("results:message",{message:"maximumSelected",args:{maximum:i.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search.attr("tabindex",0),i.$search.attr("aria-controls",r),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search.attr("tabindex",-1),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer.removeClass("select2-search--hide"):i.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var r=t[i];this.placeholder.id===r.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,r="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(i,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(i+" "+r+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,r="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+i+" "+r)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),i=null,r=this.$container.offset();r.bottom=r.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=r.top,o.bottom=r.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<r.top-s,u=l>r.bottom+s,d={left:r.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h=p.offset();d.top-=h.top,d.left-=h.left,t||n||(i="below"),u||!c||t?!c&&u&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(d.top=o.top-h.top-s),null!=i&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+i),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+i)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var r=t[i];r.children?n+=e(r.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var i=this.getHighlightedResults();if(!(i.length<1)){var r=o.GetData(i[0],"data");null!=r.element&&r.element.selected||null==r.element&&r.selected||this.trigger("select",{data:r})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,w,$,b,A,x,S,D,C,E,O,T,q,j,L,I,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=$:null!=e.data?e.dataAdapter=w:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,L))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=C;else{var i=y.Decorate(C,E);e.dropdownAdapter=i}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,I)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var r=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,r)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var i=c.extend(!0,{},n),r=n.children.length-1;0<=r;r--)null==e(t,n.children[r])&&i.children.splice(r,1);return 0<i.children.length?i:e(t,i)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,r=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(r),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],i=0;i<t.length;i++)if(n.push(t[i]),"string"==typeof t[i]&&0<t[i].indexOf("-")){var r=t[i].split("-")[0];n.push(r)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,i=0;i<e.length;i++){var r=new s,o=e[i];if("string"==typeof o)try{r=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,r=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else r=c.isPlainObject(o)?new s(o):o;n.extend(r)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var i=y._convertData(n);c.extend(!0,this.defaults,i)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(i,d,r,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=r.applyFromElement(this.options,t)),this.options=r.apply(this.options),t&&t.is("input")){var n=i(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function i(e,t){return t.toUpperCase()}for(var r=0;r<e[0].attributes.length;r++){var o=e[0].attributes[r].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,i)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(r,c,u,i){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var i=this.options.get("dataAdapter");this.dataAdapter=new i(e,this.options);var r=this.render();this._placeContainer(r);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,r);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,r);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var i=this._resolveWidth(e,"style");return null!=i?i:this._resolveWidth(e,"element")}if("element"==t){var r=e.outerWidth(!1);return r<=0?"auto":r+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){r.each(e,t._syncA),r.each(e,t._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===r.inArray(e,i)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.TAB||t===i.UP&&e.altKey?(n.close(),e.preventDefault()):t===i.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._syncSubtree=function(e,t){var n=!1,i=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var r=0;r<t.addedNodes.length;r++){t.addedNodes[r].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length&&(n=!0);else n=!0;n&&this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})})}},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var r=i[e],o={prevented:!1,name:e,args:t};if(n.call(this,r,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.trigger("query",{})},d.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];r.isArray(t)&&(t=r.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=r('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("select2/compat/utils",["jquery"],function(s){return{syncCssClasses:function(e,t,n){var i,r,o=[];(i=s.trim(e.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0===this.indexOf("select2-")&&o.push(this)}),(i=s.trim(t.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(r=n(this))&&o.push(r)}),e.attr("class",o.join(" "))}}}),e.define("select2/compat/containerCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("containerCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptContainerCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("containerCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/dropdownCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("dropdownCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptDropdownCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("dropdownCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/initSelection",["jquery"],function(i){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=n.get("initSelection"),this._isInitialized=!1,e.call(this,t,n)}return e.prototype.current=function(e,t){var n=this;this._isInitialized?e.call(this,t):this.initSelection.call(null,this.$element,function(e){n._isInitialized=!0,i.isArray(e)||(e=[e]),t(e)})},e}),e.define("select2/compat/inputData",["jquery","../utils"],function(s,i){function e(e,t,n){this._currentData=[],this._valueSeparator=n.get("valueSeparator")||",","hidden"===t.prop("type")&&n.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),e.call(this,t,n)}return e.prototype.current=function(e,t){function i(e,t){var n=[];return e.selected||-1!==s.inArray(e.id,t)?(e.selected=!0,n.push(e)):e.selected=!1,e.children&&n.push.apply(n,i(e.children,t)),n}for(var n=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r];n.push.apply(n,i(o,this.$element.val().split(this._valueSeparator)))}t(n)},e.prototype.select=function(e,t){if(this.options.get("multiple")){var n=this.$element.val();n+=this._valueSeparator+t.id,this.$element.val(n),this.$element.trigger("change")}else this.current(function(e){s.map(e,function(e){e.selected=!1})}),this.$element.val(t.id),this.$element.trigger("change")},e.prototype.unselect=function(e,r){var o=this;r.selected=!1,this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n];r.id!=i.id&&t.push(i.id)}o.$element.val(t.join(o._valueSeparator)),o.$element.trigger("change")})},e.prototype.query=function(e,t,n){for(var i=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r],s=this.matches(t,o);null!==s&&i.push(s)}n({results:i})},e.prototype.addOptions=function(e,t){var n=s.map(t,function(e){return i.GetData(e[0],"data")});this._currentData.push.apply(this._currentData,n)},e}),e.define("select2/compat/matcher",["jquery"],function(s){return function(o){return function(e,t){var n=s.extend(!0,{},t);if(null==e.term||""===s.trim(e.term))return n;if(t.children){for(var i=t.children.length-1;0<=i;i--){var r=t.children[i];o(e.term,r.text,r)||n.children.splice(i,1)}if(0<n.children.length)return n}return o(e.term,t.text,t)?n:null}}}),e.define("select2/compat/query",[],function(){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.callback=n,this.options.get("query").call(null,t)},e}),e.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t.addClass("select2-dropdown--below"),n.addClass("select2-container--below")},e}),e.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),e.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),l=function(p){var h,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(p.event.fixHooks)for(var n=e.length;n;)p.event.fixHooks[e[--n]]=p.event.mouseHooks;var m=p.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,!1);else this.onmousewheel=i;p.data(this,"mousewheel-line-height",m.getLineHeight(this)),p.data(this,"mousewheel-page-height",m.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],i,!1);else this.onmousewheel=null;p.removeData(this,"mousewheel-line-height"),p.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=p(e),n=t["offsetParent"in p.fn?"offsetParent":"parent"]();return n.length||(n=p("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return p(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n=e||window.event,i=g.call(arguments,1),r=0,o=0,s=0,a=0,l=0;if((e=p.event.fix(n)).type="mousewheel","detail"in n&&(s=-1*n.detail),"wheelDelta"in n&&(s=n.wheelDelta),"wheelDeltaY"in n&&(s=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*s,s=0),r=0===s?o:s,"deltaY"in n&&(r=s=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===s&&(r=-1*o)),0!==s||0!==o){if(1===n.deltaMode){var c=p.data(this,"mousewheel-line-height");r*=c,s*=c,o*=c}else if(2===n.deltaMode){var u=p.data(this,"mousewheel-page-height");r*=u,s*=u,o*=u}if(t=Math.max(Math.abs(s),Math.abs(o)),(!f||t<f)&&y(n,f=t)&&(f/=40),y(n,t)&&(r/=40,o/=40,s/=40),r=Math[1<=r?"floor":"ceil"](r/f),o=Math[1<=o?"floor":"ceil"](o/f),s=Math[1<=s?"floor":"ceil"](s/f),m.settings.normalizeOffset&&this.getBoundingClientRect){var d=this.getBoundingClientRect();a=e.clientX-d.left,l=e.clientY-d.top}return e.deltaX=o,e.deltaY=s,e.deltaFactor=f,e.offsetX=a,e.offsetY=l,e.deltaMode=0,i.unshift(e,r,o,s),h&&clearTimeout(h),h=setTimeout(v,200),(p.event.dispatch||p.event.handle).apply(this,i)}}function v(){f=null}function y(e,t){return m.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}p.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof e.define&&e.define.amd?e.define("jquery-mousewheel",["jquery"],l):"object"==typeof exports?module.exports=l:l(d),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(r,e,o,t,s){if(null==r.fn.select2){var a=["open","close","destroy"];r.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=r.extend(!0,{},t);new o(r(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,i=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<r.inArray(t,a)?this:n}}return null==r.fn.select2.defaults&&(r.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return d.fn.select2.amd=e,t});
\ No newline at end of file

From 74b4ff49936d7cae99f78ceea76b241c0ab905a5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 10 Oct 2019 12:47:21 +0800
Subject: [PATCH 06/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9celery=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/templates/ops/celery_task_log.html   |  7 +-
 .../ops/command_execution_create.html         | 68 +++++++++----------
 apps/ops/urls/ws_urls.py                      |  2 +-
 apps/ops/views/command.py                     |  3 +-
 apps/ops/ws.py                                | 65 +++++++++++-------
 5 files changed, 83 insertions(+), 62 deletions(-)

diff --git a/apps/ops/templates/ops/celery_task_log.html b/apps/ops/templates/ops/celery_task_log.html
index 7e2527e75..8e99c356d 100644
--- a/apps/ops/templates/ops/celery_task_log.html
+++ b/apps/ops/templates/ops/celery_task_log.html
@@ -22,7 +22,8 @@
 <script>
     var scheme = document.location.protocol === "https:" ? "wss" : "ws";
     var port = document.location.port ? ":" + document.location.port : "";
-    var url = "/ws/ops/tasks/" + "{{ task_id }}" + "/log/";
+    var taskId = "{{ task_id }}";
+    var url = "/ws/ops/tasks/log/";
     var wsURL = scheme + "://" + document.location.hostname + port + url;
     var failOverPort = "{{ ws_port }}";
     var failOverWsURL = scheme + "://" + document.location.hostname + ':' + failOverPort + url;
@@ -46,6 +47,10 @@
             var data = JSON.parse(e.data);
             term.write(data.message);
         };
+        ws.onopen = function() {
+            var msg = {"task": taskId};
+            ws.send(JSON.stringify(msg))
+        };
         ws.onerror = function (e) {
             ws = new WebSocket(failOverWsURL);
             ws.onmessage = function(e) {
diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html
index e0e96f267..f550c51d3 100644
--- a/apps/ops/templates/ops/command_execution_create.html
+++ b/apps/ops/templates/ops/command_execution_create.html
@@ -237,6 +237,7 @@
         }
 
         var term = null;
+        var ws = null;
 
         function initResultTerminal() {
             term = new Terminal({
@@ -254,7 +255,29 @@
             term.open(document.getElementById('term'));
             var msg = "{% trans 'Select the left asset, select the running system user, execute command in batch' %}" + "\r\n";
             fit(term);
-            term.write(msg)
+            term.write(msg);
+
+            var scheme = document.location.protocol === "https:" ? "wss" : "ws";
+            var port = document.location.port ? ":" + document.location.port : "";
+            var url = "/ws/ops/tasks/log/";
+            var wsURL = scheme + "://" + document.location.hostname + port + url;
+            var failOverPort = "{{ ws_port }}";
+            var failOverWsURL = scheme + "://" + document.location.hostname + ':' + failOverPort + url;
+            ws = new WebSocket(wsURL);
+            ws.onerror = function (e) {
+                ws = new WebSocket(failOverWsURL);
+                ws.onmessage = function(e) {
+                    var data = JSON.parse(e.data);
+                    term.write(data.message);
+                };
+                ws.onerror = function (e) {
+                    term.write("Connect websocket server error")
+                }
+            };
+            ws.onmessage = function(e) {
+                var data = JSON.parse(e.data);
+                term.write(data.message);
+            };
         }
 
         function wrapperError(msg) {
@@ -289,35 +312,12 @@
                 run_as: run_as,
                 command: command
             };
-            var mark = '';
-            var log_url = null;
-            var end = false;
-            var error = false;
-            var int = null;
-            var interval = 200;
 
-            function writeExecutionOutput() {
-                if (!end) {
-                    $.ajax({
-                        url: log_url + '?mark=' + mark,
-                        method: "GET",
-                        contentType: "application/json; charset=utf-8"
-                    }).done(function (data, textStatue, jqXHR) {
-                        if (jqXHR.status === 203) {
-                            error = true;
-                            term.write('.');
-                            interval = 500;
-                        }
-                        if (jqXHR.status === 200) {
-                            term.write(data.data);
-                            mark = data.mark;
-                            if (data.end) {
-                                end = true;
-                                window.clearInterval(int)
-                            }
-                        }
-                    })
-                }
+            function writeExecutionOutput(taskId) {
+                var msg = "{% trans 'Pending' %} ";
+                term.write(msg);
+                msg = JSON.stringify({task: taskId});
+                ws.send(msg);
             }
 
             requestApi({
@@ -326,12 +326,8 @@
                 method: 'POST',
                 flash_message: false,
                 success: function (resp) {
-                    var msg = "{% trans 'Pending' %}";
-                    term.write(msg + "...\r\n");
-                    log_url = resp.log_url;
-                    int = setInterval(function () {
-                        writeExecutionOutput()
-                    }, interval);
+                    {#log_url = resp.log_url;#}
+                    writeExecutionOutput(resp.id)
                 }
             });
             return false;
@@ -340,6 +336,8 @@
         var editor;
         $(document).ready(function () {
             systemUserId = $('#system-users-select').val();
+
+
             $(".select2").select2({
                 dropdownAutoWidth: true,
             }).on('select2:select', function (evt) {
diff --git a/apps/ops/urls/ws_urls.py b/apps/ops/urls/ws_urls.py
index d3148982e..5b6bd74d2 100644
--- a/apps/ops/urls/ws_urls.py
+++ b/apps/ops/urls/ws_urls.py
@@ -5,5 +5,5 @@ from .. import ws
 app_name = 'ops'
 
 urlpatterns = [
-    path('ws/ops/tasks/<uuid:task_id>/log/', ws.CeleryLogWebsocket, name='task-log-ws'),
+    path('ws/ops/tasks/log/', ws.CeleryLogWebsocket, name='task-log-ws'),
 ]
diff --git a/apps/ops/views/command.py b/apps/ops/views/command.py
index 0b0ec6542..ba00bc617 100644
--- a/apps/ops/views/command.py
+++ b/apps/ops/views/command.py
@@ -79,7 +79,8 @@ class CommandExecutionStartView(PermissionsMixin, TemplateView):
             'app': _('Ops'),
             'action': _('Command execution'),
             'form': self.get_form(),
-            'system_users': system_users
+            'system_users': system_users,
+            'ws_port': settings.CONFIG.WS_LISTEN_PORT
         }
         kwargs.update(context)
         return super().get_context_data(**kwargs)
diff --git a/apps/ops/ws.py b/apps/ops/ws.py
index fbc46c1db..1d2bea3c5 100644
--- a/apps/ops/ws.py
+++ b/apps/ops/ws.py
@@ -1,41 +1,58 @@
 import time
+import os
 import threading
+import json
+
+from celery.result import AsyncResult
 
 from .celery.utils import get_celery_task_log_path
 from channels.generic.websocket import JsonWebsocketConsumer
 
 
 class CeleryLogWebsocket(JsonWebsocketConsumer):
-    task = ''
-    task_log_f = None
     disconnected = False
 
     def connect(self):
-        task_id = self.scope['url_route']['kwargs']['task_id']
-        log_path = get_celery_task_log_path(task_id)
-        try:
-            self.task_log_f = open(log_path)
-        except OSError:
-            self.send({'message': "Task {} log not found".format(task_id)})
-            self.disconnect(None)
-            return
-
         self.accept()
-        self.send_log_to_client()
+
+    def receive(self, text_data=None, bytes_data=None, **kwargs):
+        data = json.loads(text_data)
+        task_id = data.get("task")
+        if task_id:
+            self.handle_task(task_id)
+
+    def handle_task(self, task_id):
+        log_path = get_celery_task_log_path(task_id)
+
+        def func():
+            task_log_f = None
+
+            while not self.disconnected:
+                if not os.path.exists(log_path):
+                    self.send_json({'message': '.', 'task': task_id})
+                    time.sleep(0.5)
+                    continue
+                self.send_json({'message': '\r\n'})
+                try:
+                    task_log_f = open(log_path)
+                    break
+                except OSError:
+                    return
+
+            while not self.disconnected:
+                data = task_log_f.readline()
+                if data:
+                    data = data.replace('\n', '\r\n')
+                    self.send_json({'message': data, 'task': task_id})
+                    if data.startswith('Task') and data.find('succeeded'):
+                        break
+                time.sleep(0.2)
+            task_log_f.close()
+        thread = threading.Thread(target=func)
+        thread.start()
 
     def disconnect(self, close_code):
         self.disconnected = True
-        if self.task_log_f and not self.task_log_f.closed:
-            self.task_log_f.close()
         self.close()
 
-    def send_log_to_client(self):
-        def func():
-            while not self.disconnected:
-                data = self.task_log_f.read(4096)
-                if data:
-                    data = data.replace('\n', '\r\n')
-                    self.send_json({'message': data})
-                time.sleep(0.2)
-        thread = threading.Thread(target=func)
-        thread.start()
+

From 5f96f8c229b349f2856986185420807bb4effe28 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 10 Oct 2019 16:18:29 +0800
Subject: [PATCH 07/27] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=88=A0=E9=99=A4=20API=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/node.py              |  12 +++-
 apps/assets/models/node.py           |   7 +-
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 80778 -> 80897 bytes
 apps/locale/zh/LC_MESSAGES/django.po |  99 ++++++++++++++-------------
 4 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py
index 4e608163f..fbdebabc5 100644
--- a/apps/assets/api/node.py
+++ b/apps/assets/api/node.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from rest_framework import generics
+from rest_framework import generics, status
 from rest_framework.serializers import ValidationError
 from rest_framework.views import APIView
 from rest_framework.response import Response
@@ -59,6 +59,16 @@ class NodeViewSet(OrgModelViewSet):
             raise ValidationError({"error": msg})
         return super().perform_update(serializer)
 
+    def destroy(self, request, *args, **kwargs):
+        node = self.get_object()
+        if node.has_children_or_contains_assets():
+            msg = _("Deletion failed "
+                    "and the node contains children or assets")
+            return Response(
+                data={'msg': msg}, status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+        return super().destroy(request, *args, **kwargs)
+
 
 class NodeListAsTreeApi(generics.ListAPIView):
     """
diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index d1628be76..71e1d4a24 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -470,8 +470,13 @@ class Node(OrgModelMixin, SomeNodesMixin, TreeMixin, FamilyMixin, FullValueMixin
         tree_node = TreeNode(**data)
         return tree_node
 
-    def delete(self, using=None, keep_parents=False):
+    def has_children_or_contains_assets(self):
         if self.children or self.get_assets():
+            return True
+        return False
+
+    def delete(self, using=None, keep_parents=False):
+        if self.has_children_or_contains_assets():
             return
         return super().delete(using=using, keep_parents=keep_parents)
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 4d853714e2fee29dd0f111503dab31528d3d45e8..39c1b8257bb75983e7d5bd0eddbdf40b1b569cd8 100644
GIT binary patch
delta 23445
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
Xf*al&IrYKDp?9_}S>NeJ+UoxY-$O&u

delta 23325
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%0D6qw>Sd
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
F{tv);9W?*|

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 4240cb36f..6abaad43b 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-08 17:09+0800\n"
+"POT-Creation-Date: 2019-10-10 16:15+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -114,7 +114,7 @@ msgstr "资产"
 #: applications/templates/applications/user_remote_app_list.html:16
 #: assets/forms/asset.py:24 assets/forms/domain.py:73 assets/forms/user.py:74
 #: assets/forms/user.py:94 assets/models/base.py:28 assets/models/cluster.py:18
-#: assets/models/cmd_filter.py:20 assets/models/domain.py:20
+#: assets/models/cmd_filter.py:21 assets/models/domain.py:20
 #: assets/models/group.py:20 assets/models/label.py:18
 #: assets/templates/assets/admin_user_detail.html:56
 #: assets/templates/assets/admin_user_list.html:44
@@ -186,8 +186,8 @@ msgstr "参数"
 #: applications/models/remote_app.py:39
 #: applications/templates/applications/remote_app_detail.html:73
 #: assets/models/asset.py:174 assets/models/base.py:36
-#: assets/models/cluster.py:28 assets/models/cmd_filter.py:25
-#: assets/models/cmd_filter.py:58 assets/models/group.py:21
+#: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
+#: assets/models/cmd_filter.py:59 assets/models/group.py:21
 #: assets/templates/assets/admin_user_detail.html:68
 #: assets/templates/assets/asset_detail.html:124
 #: assets/templates/assets/cmd_filter_detail.html:77
@@ -238,8 +238,8 @@ msgstr "创建日期"
 #: applications/templates/applications/remote_app_list.html:23
 #: applications/templates/applications/user_remote_app_list.html:19
 #: assets/models/asset.py:176 assets/models/base.py:33
-#: assets/models/cluster.py:29 assets/models/cmd_filter.py:22
-#: assets/models/cmd_filter.py:55 assets/models/domain.py:21
+#: assets/models/cluster.py:29 assets/models/cmd_filter.py:23
+#: assets/models/cmd_filter.py:56 assets/models/domain.py:21
 #: assets/models/domain.py:53 assets/models/group.py:23
 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:50
@@ -498,7 +498,7 @@ msgstr "创建远程应用"
 
 #: applications/templates/applications/remote_app_list.html:24
 #: applications/templates/applications/user_remote_app_list.html:20
-#: assets/models/cmd_filter.py:54
+#: assets/models/cmd_filter.py:55
 #: assets/templates/assets/_asset_user_list.html:25
 #: assets/templates/assets/admin_user_list.html:51
 #: assets/templates/assets/asset_list.html:100
@@ -568,11 +568,15 @@ msgstr "我的远程应用"
 msgid "You can't update the root node name"
 msgstr "不能修改根节点名称"
 
-#: assets/api/node.py:266
+#: assets/api/node.py:65
+msgid "Deletion failed and the node contains children or assets"
+msgstr "删除失败，节点包含子节点或资产"
+
+#: assets/api/node.py:276
 msgid "Update node asset hardware information: {}"
 msgstr "更新节点资产硬件信息: {}"
 
-#: assets/api/node.py:280
+#: assets/api/node.py:290
 msgid "Test if the assets under the node are connectable: {}"
 msgstr "测试节点下资产是否可连接: {}"
 
@@ -745,7 +749,7 @@ msgstr "不合法的密钥，仅支持RSA/DSA格式的密钥"
 msgid "Password and private key file must be input one"
 msgstr "密码和私钥, 必须输入一个"
 
-#: assets/forms/user.py:97 assets/models/cmd_filter.py:31
+#: assets/forms/user.py:97 assets/models/cmd_filter.py:32
 #: assets/models/user.py:118 assets/templates/assets/_system_user.html:66
 #: assets/templates/assets/system_user_detail.html:165
 msgid "Command filter"
@@ -828,7 +832,7 @@ msgid "Platform"
 msgstr "系统平台"
 
 #: assets/models/asset.py:146 assets/models/authbook.py:27
-#: assets/models/cmd_filter.py:21 assets/models/domain.py:54
+#: assets/models/cmd_filter.py:22 assets/models/domain.py:54
 #: assets/models/label.py:22 assets/templates/assets/asset_detail.html:112
 msgid "Is active"
 msgstr "激活"
@@ -994,11 +998,11 @@ msgstr "北京电信"
 msgid "BGP full netcom"
 msgstr "BGP全网通"
 
-#: assets/models/cmd_filter.py:38
+#: assets/models/cmd_filter.py:39
 msgid "Regex"
 msgstr "正则表达式"
 
-#: assets/models/cmd_filter.py:39 ops/models/command.py:21
+#: assets/models/cmd_filter.py:40 ops/models/command.py:21
 #: ops/templates/ops/command_execution_list.html:64 terminal/models.py:163
 #: terminal/templates/terminal/command_list.html:28
 #: terminal/templates/terminal/command_list.html:68
@@ -1007,19 +1011,19 @@ msgstr "正则表达式"
 msgid "Command"
 msgstr "命令"
 
-#: assets/models/cmd_filter.py:44
+#: assets/models/cmd_filter.py:45
 msgid "Deny"
 msgstr "拒绝"
 
-#: assets/models/cmd_filter.py:45
+#: assets/models/cmd_filter.py:46
 msgid "Allow"
 msgstr "允许"
 
-#: assets/models/cmd_filter.py:49
+#: assets/models/cmd_filter.py:50
 msgid "Filter"
 msgstr "过滤器"
 
-#: assets/models/cmd_filter.py:50
+#: assets/models/cmd_filter.py:51
 #: assets/templates/assets/cmd_filter_rule_list.html:58
 #: audits/templates/audits/login_log_list.html:58
 #: perms/templates/perms/remote_app_permission_remote_app.html:54
@@ -1030,26 +1034,26 @@ msgstr "过滤器"
 msgid "Type"
 msgstr "类型"
 
-#: assets/models/cmd_filter.py:51 assets/models/user.py:112
+#: assets/models/cmd_filter.py:52 assets/models/user.py:112
 #: assets/templates/assets/cmd_filter_rule_list.html:60
 msgid "Priority"
 msgstr "优先级"
 
-#: assets/models/cmd_filter.py:51
+#: assets/models/cmd_filter.py:52
 msgid "1-100, the higher will be match first"
 msgstr "优先级可选范围为1-100，1最低优先级，100最高优先级"
 
-#: assets/models/cmd_filter.py:53
+#: assets/models/cmd_filter.py:54
 #: assets/templates/assets/cmd_filter_rule_list.html:59
 #: xpack/plugins/license/models.py:29
 msgid "Content"
 msgstr "内容"
 
-#: assets/models/cmd_filter.py:53
+#: assets/models/cmd_filter.py:54
 msgid "One line one command"
 msgstr "每行一个命令"
 
-#: assets/models/cmd_filter.py:64
+#: assets/models/cmd_filter.py:63
 msgid "Command filter rule"
 msgstr "命令过滤规则"
 
@@ -1208,16 +1212,16 @@ msgstr "系统用户"
 msgid "%(value)s is not an even number"
 msgstr "%(value)s is not an even number"
 
-#: assets/models/utils.py:43 assets/tasks/const.py:81
+#: assets/models/utils.py:43 assets/tasks/const.py:84
 msgid "Unreachable"
 msgstr "不可达"
 
-#: assets/models/utils.py:44 assets/tasks/const.py:82
+#: assets/models/utils.py:44 assets/tasks/const.py:85
 #: assets/templates/assets/asset_list.html:99
 msgid "Reachable"
 msgstr "可连接"
 
-#: assets/models/utils.py:45 assets/tasks/const.py:83
+#: assets/models/utils.py:45 assets/tasks/const.py:86
 #: authentication/utils.py:13 xpack/plugins/license/models.py:78
 msgid "Unknown"
 msgstr "未知"
@@ -1424,6 +1428,7 @@ msgstr "资产列表"
 #: assets/templates/assets/_asset_list_modal.html:33
 #: assets/templates/assets/_node_tree.html:40
 #: ops/templates/ops/command_execution_create.html:49
+#: ops/templates/ops/command_execution_create.html:143
 #: users/templates/users/_granted_assets.html:7
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66
 msgid "Loading"
@@ -1639,7 +1644,7 @@ msgstr "选择节点"
 #: assets/templates/assets/system_user_list.html:139
 #: authentication/templates/authentication/_mfa_confirm_modal.html:20
 #: settings/templates/settings/terminal_setting.html:168
-#: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:108
+#: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112
 #: users/templates/users/user_detail.html:394
 #: users/templates/users/user_detail.html:420
 #: users/templates/users/user_detail.html:443
@@ -1720,7 +1725,7 @@ msgstr "资产用户"
 
 #: assets/templates/assets/asset_asset_user_list.html:47
 #: assets/templates/assets/asset_detail.html:144
-#: terminal/templates/terminal/session_detail.html:81
+#: terminal/templates/terminal/session_detail.html:85
 #: users/templates/users/user_detail.html:140
 #: users/templates/users/user_profile.html:150
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128
@@ -2984,38 +2989,38 @@ msgid "Task log"
 msgstr "任务列表"
 
 #: ops/templates/ops/command_execution_create.html:90
-#: terminal/templates/terminal/session_detail.html:91
-#: terminal/templates/terminal/session_detail.html:100
+#: terminal/templates/terminal/session_detail.html:95
+#: terminal/templates/terminal/session_detail.html:104
 msgid "Go"
 msgstr ""
 
-#: ops/templates/ops/command_execution_create.html:215
+#: ops/templates/ops/command_execution_create.html:216
 msgid "Selected assets"
 msgstr "已选择资产"
 
-#: ops/templates/ops/command_execution_create.html:218
+#: ops/templates/ops/command_execution_create.html:219
 msgid "In total"
 msgstr "总共"
 
-#: ops/templates/ops/command_execution_create.html:254
+#: ops/templates/ops/command_execution_create.html:256
 msgid ""
 "Select the left asset, select the running system user, execute command in "
 "batch"
 msgstr "选择左侧资产, 选择运行的系统用户，批量执行命令"
 
-#: ops/templates/ops/command_execution_create.html:275
+#: ops/templates/ops/command_execution_create.html:299
 msgid "Unselected assets"
 msgstr "没有选中资产"
 
-#: ops/templates/ops/command_execution_create.html:279
+#: ops/templates/ops/command_execution_create.html:303
 msgid "No input command"
 msgstr "没有输入命令"
 
-#: ops/templates/ops/command_execution_create.html:283
+#: ops/templates/ops/command_execution_create.html:307
 msgid "No system user was selected"
 msgstr "没有选择系统用户"
 
-#: ops/templates/ops/command_execution_create.html:328
+#: ops/templates/ops/command_execution_create.html:317
 msgid "Pending"
 msgstr "等待"
 
@@ -3394,21 +3399,21 @@ msgstr "连接LDAP成功"
 msgid "Match {} s users"
 msgstr "匹配 {} 个用户"
 
-#: settings/api.py:163
+#: settings/api.py:151
 msgid "succeed: {} failed: {} total: {}"
 msgstr "成功：{} 失败：{} 总数：{}"
 
-#: settings/api.py:185 settings/api.py:221
+#: settings/api.py:173 settings/api.py:209
 msgid ""
 "Error: Account invalid (Please make sure the information such as Access key "
 "or Secret key is correct)"
 msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）"
 
-#: settings/api.py:191 settings/api.py:227
+#: settings/api.py:179 settings/api.py:215
 msgid "Create succeed"
 msgstr "创建成功"
 
-#: settings/api.py:209 settings/api.py:247
+#: settings/api.py:197 settings/api.py:235
 #: settings/templates/settings/terminal_setting.html:154
 msgid "Delete succeed"
 msgstr "删除成功"
@@ -3923,11 +3928,11 @@ msgstr "删除失败"
 msgid "Are you sure about deleting it?"
 msgstr "您确定删除吗?"
 
-#: settings/utils.py:91
+#: settings/utils.py:98
 msgid "Search no entry matched in ou {}"
 msgstr "在ou:{}中没有匹配条目"
 
-#: settings/utils.py:146
+#: settings/utils.py:172
 msgid "The user source is not LDAP"
 msgstr "用户来源不是LDAP"
 
@@ -4404,7 +4409,7 @@ msgstr "参数"
 msgid "Export command"
 msgstr "导出命令"
 
-#: terminal/templates/terminal/command_list.html:191
+#: terminal/templates/terminal/command_list.html:205
 msgid "Goto"
 msgstr "转到"
 
@@ -4418,19 +4423,19 @@ msgstr "会话详情"
 msgid "Command list"
 msgstr "命令记录列表"
 
-#: terminal/templates/terminal/session_detail.html:63
+#: terminal/templates/terminal/session_detail.html:67
 msgid "There is no command about this session"
 msgstr "该会话没有命令记录"
 
-#: terminal/templates/terminal/session_detail.html:88
+#: terminal/templates/terminal/session_detail.html:92
 msgid "Replay session"
 msgstr "回放会话"
 
-#: terminal/templates/terminal/session_detail.html:97
+#: terminal/templates/terminal/session_detail.html:101
 msgid "Monitor session"
 msgstr "监控"
 
-#: terminal/templates/terminal/session_detail.html:105
+#: terminal/templates/terminal/session_detail.html:109
 msgid "Terminate session"
 msgstr "终止会话"
 

From 7ff6391801da757019fa2c94562a6f301d2bf007 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 10 Oct 2019 16:59:57 +0800
Subject: [PATCH 08/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=8A=82=E7=82=B9=20API=20=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/node.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py
index fbdebabc5..a48d5f00d 100644
--- a/apps/assets/api/node.py
+++ b/apps/assets/api/node.py
@@ -62,11 +62,8 @@ class NodeViewSet(OrgModelViewSet):
     def destroy(self, request, *args, **kwargs):
         node = self.get_object()
         if node.has_children_or_contains_assets():
-            msg = _("Deletion failed "
-                    "and the node contains children or assets")
-            return Response(
-                data={'msg': msg}, status=status.HTTP_500_INTERNAL_SERVER_ERROR
-            )
+            msg = _("Deletion failed and the node contains children or assets")
+            return Response(data={'msg': msg}, status=status.HTTP_403_FORBIDDEN)
         return super().destroy(request, *args, **kwargs)
 
 

From dfedfc7e7a7be168e0e9e7941e9f3e8452244277 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 10 Oct 2019 17:53:22 +0800
Subject: [PATCH 09/27] =?UTF-8?q?[Update]=20LDAP=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=AA=E6=9C=89=E5=9C=A8=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/backends/ldap.py | 7 +++++++
 apps/jumpserver/conf.py              | 1 +
 apps/jumpserver/settings.py          | 1 +
 3 files changed, 9 insertions(+)

diff --git a/apps/authentication/backends/ldap.py b/apps/authentication/backends/ldap.py
index 9dd151561..07ec0f375 100644
--- a/apps/authentication/backends/ldap.py
+++ b/apps/authentication/backends/ldap.py
@@ -32,6 +32,13 @@ class LDAPAuthorizationBackend(LDAPBackend):
         if not username:
             logger.info('Authenticate failed: username is None')
             return None
+        if settings.AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS:
+            user_model = self.get_user_model()
+            exist = user_model.objects.filter(username=username).exists()
+            if not exist:
+                msg = 'Authentication failed: user ({}) is not in the user list'
+                logger.info(msg.format(username))
+                return None
         ldap_user = LDAPUser(self, username=username.strip(), request=request)
         user = self.authenticate_ldap_user(ldap_user, password)
         logger.info('Authenticate user: {}'.format(user))
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 9825eaece..0df26d149 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -378,6 +378,7 @@ defaults = {
     'AUTH_LDAP_SYNC_IS_PERIODIC': False,
     'AUTH_LDAP_SYNC_INTERVAL': None,
     'AUTH_LDAP_SYNC_CRONTAB': None,
+    'AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS': False,
     'HTTP_BIND_HOST': '0.0.0.0',
     'HTTP_LISTEN_PORT': 8080,
     'WS_LISTEN_PORT': 8070,
diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index b0db8dbab..6088358f1 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -429,6 +429,7 @@ AUTH_LDAP_SEARCH_PAGED_SIZE = CONFIG.AUTH_LDAP_SEARCH_PAGED_SIZE
 AUTH_LDAP_SYNC_IS_PERIODIC = CONFIG.AUTH_LDAP_SYNC_IS_PERIODIC
 AUTH_LDAP_SYNC_INTERVAL = CONFIG.AUTH_LDAP_SYNC_INTERVAL
 AUTH_LDAP_SYNC_CRONTAB = CONFIG.AUTH_LDAP_SYNC_CRONTAB
+AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS = CONFIG.AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS
 
 AUTH_LDAP_SERVER_URI = 'ldap://localhost:389'
 AUTH_LDAP_BIND_DN = 'cn=admin,dc=jumpserver,dc=org'

From d1dc3342a24c1ac581a1181f898e1217863d9d8d Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 10 Oct 2019 18:04:31 +0800
Subject: [PATCH 10/27] =?UTF-8?q?[Update]=20=E9=85=8D=E7=BD=AE=E9=A1=B9=20?=
 =?UTF-8?q?AUTH=5FLDAP=5FUSER=5FLOGIN=5FONLY=5FIN=5FUSERS=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=20config=5Fexample.yml=20=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config_example.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config_example.yml b/config_example.yml
index 911e7b8ee..786de3257 100644
--- a/config_example.yml
+++ b/config_example.yml
@@ -72,13 +72,18 @@ REDIS_PORT: 6379
 # RADIUS_PORT: 1812
 # RADIUS_SECRET: 
 
-# LDAP/AD 设置定时同步参数
+# LDAP/AD settings
+# 定时同步用户
 # 启用/禁用
 # AUTH_LDAP_SYNC_IS_PERIODIC: True
 # 单位: 时
 # AUTH_LDAP_SYNC_INTERVAL: 12
 # Crontab 表达式
 # AUTH_LDAP_SYNC_CRONTAB: * 6 * * *
+#
+# LDAP 用户登录时仅允许在用户列表中的用户执行 LDAP Server 认证
+# AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS: False
+
 
 # OTP settings
 # OTP/MFA 配置

From 7574966ccf8896b55eb3af07863d8d506fde4d53 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Fri, 11 Oct 2019 11:22:11 +0800
Subject: [PATCH 11/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E5=9C=A8=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=88=E5=88=A0=E9=99=A4/=E6=9B=B4=E6=96=B0=EF=BC=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_detail.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html
index 221818d2d..b0d35f382 100644
--- a/apps/assets/templates/assets/asset_detail.html
+++ b/apps/assets/templates/assets/asset_detail.html
@@ -22,7 +22,6 @@
                             <li>
                                 <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset user list' %} </a>
                             </li>
-                            {% if user.is_superuser %}
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-default" href="{% url 'assets:asset-update' pk=asset.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
@@ -31,7 +30,6 @@
                                     <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
-                            {% endif %}
                         </ul>
                     </div>
                     <div class="tab-content">

From 70713af95a2bb330650ce11c63c18a31ac66a01a Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Sat, 12 Oct 2019 16:51:09 +0800
Subject: [PATCH 12/27] =?UTF-8?q?[Update]=20=E9=99=90=E5=88=B6=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=90=8D=E7=A7=B0=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/const.py             | 14 ++++++++++++++
 apps/assets/forms/asset.py       |  9 +++------
 apps/assets/serializers/asset.py |  8 ++++++--
 apps/orgs/serializers.py         | 15 ++++++++++++++-
 4 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 apps/assets/const.py

diff --git a/apps/assets/const.py b/apps/assets/const.py
new file mode 100644
index 000000000..c23b700ba
--- /dev/null
+++ b/apps/assets/const.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+#
+
+from django.utils.translation import ugettext_lazy as _
+
+
+GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT = _(
+    'Only Numbers、letters、 chinese and characters ( {} ) are allowed'
+).format(" ".join(['.', '_', '@', '-']))
+
+GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN = r"^[\._@\w-]+$"
+
+GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG = \
+    _("* The contains characters that are not allowed")
diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index d83172373..d3d64d602 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -7,6 +7,7 @@ from common.utils import get_logger
 from orgs.mixins.forms import OrgModelForm
 
 from ..models import Asset, Node
+from ..const import GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT
 
 
 logger = get_logger(__file__)
@@ -14,10 +15,6 @@ __all__ = [
     'AssetCreateForm', 'AssetUpdateForm', 'AssetBulkUpdateForm', 'ProtocolForm',
 ]
 
-HELP_TEXTS_ASSET_HOSTNAME = _(
-    'Only Numbers、letters、 chinese and characters ( {} ) are allowed'
-).format(" ".join(['.', '_', '@']))
-
 
 class ProtocolForm(forms.Form):
     name = forms.ChoiceField(
@@ -72,7 +69,7 @@ class AssetCreateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': HELP_TEXTS_ASSET_HOSTNAME,
+            'hostname': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -119,7 +116,7 @@ class AssetUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': HELP_TEXTS_ASSET_HOSTNAME,
+            'hostname': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index c53b3057d..529ee1fde 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -8,6 +8,10 @@ from django.utils.translation import ugettext_lazy as _
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from common.serializers import AdaptedBulkListSerializer
 from ..models import Asset, Node, Label
+from ..const import (
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+)
 from .base import ConnectivitySerializer
 
 __all__ = [
@@ -94,10 +98,10 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
 
     @staticmethod
     def validate_hostname(hostname):
-        pattern = r"^[\._@\w-]+$"
+        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
         res = re.match(pattern, hostname)
         if res is None:
-            msg = _("* The hostname contains characters that are not allowed")
+            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
             raise serializers.ValidationError(msg)
         return hostname
 
diff --git a/apps/orgs/serializers.py b/apps/orgs/serializers.py
index 222598c88..8f4df1e10 100644
--- a/apps/orgs/serializers.py
+++ b/apps/orgs/serializers.py
@@ -1,9 +1,13 @@
 
+import re
 from rest_framework.serializers import ModelSerializer
 from rest_framework import serializers
-
 from users.models import User, UserGroup
 from assets.models import Asset, Domain, AdminUser, SystemUser, Label
+from assets.const import (
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+)
 from perms.models import AssetPermission
 from common.serializers import AdaptedBulkListSerializer
 from .utils import set_current_org, get_current_org
@@ -18,6 +22,15 @@ class OrgSerializer(ModelSerializer):
         fields = '__all__'
         read_only_fields = ['created_by', 'date_created']
 
+    @staticmethod
+    def validate_name(name):
+        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
+        res = re.match(pattern, name)
+        if res is None:
+            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+            raise serializers.ValidationError(msg)
+        return name
+
 
 class OrgReadSerializer(ModelSerializer):
     admins = serializers.SlugRelatedField(slug_field='name', many=True, read_only=True)

From 21b17ca41a27e7350f14ef99fac774ae74007024 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Sat, 12 Oct 2019 17:05:49 +0800
Subject: [PATCH 13/27] =?UTF-8?q?[Update]=20=E7=B3=BB=E7=BB=9F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20name=20=E9=99=90=E5=88=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/forms/user.py              |  2 ++
 apps/assets/serializers/system_user.py | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/apps/assets/forms/user.py b/apps/assets/forms/user.py
index 3d67b434b..b50639684 100644
--- a/apps/assets/forms/user.py
+++ b/apps/assets/forms/user.py
@@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _
 from common.utils import validate_ssh_private_key, ssh_pubkey_gen, get_logger
 from orgs.mixins.forms import OrgModelForm
 from ..models import AdminUser, SystemUser
+from ..const import GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT
 
 logger = get_logger(__file__)
 __all__ = [
@@ -98,6 +99,7 @@ class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
             }),
         }
         help_texts = {
+            'name': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
             'auto_push': _('Auto push system user to asset'),
             'priority': _('1-100, High level will be using login asset as default, '
                           'if user was granted more than 2 system user'),
diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py
index eea93360b..3194f2fb6 100644
--- a/apps/assets/serializers/system_user.py
+++ b/apps/assets/serializers/system_user.py
@@ -1,3 +1,4 @@
+import re
 from rest_framework import serializers
 
 from django.utils.translation import ugettext_lazy as _
@@ -6,6 +7,10 @@ from common.serializers import AdaptedBulkListSerializer
 from common.utils import ssh_pubkey_gen
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from ..models import SystemUser
+from ..const import (
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+)
 from .base import AuthSerializer, AuthSerializerMixin
 
 
@@ -33,6 +38,15 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
             'created_by': {'read_only': True},
         }
 
+    @staticmethod
+    def validate_name(name):
+        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
+        res = re.match(pattern, name)
+        if res is None:
+            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+            raise serializers.ValidationError(msg)
+        return name
+
     def validate_auto_push(self, value):
         login_mode = self.initial_data.get("login_mode")
         protocol = self.initial_data.get("protocol")

From 1f5cdc3fa4fbef10b3b18b91ba388aafa339db53 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Sat, 12 Oct 2019 17:42:00 +0800
Subject: [PATCH 14/27] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91:=20=E9=99=90=E5=88=B6=20=E7=BB=84=E7=BB=87/=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=20=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 80897 -> 80879 bytes
 apps/locale/zh/LC_MESSAGES/django.po | 148 +++++++++++++--------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 39c1b8257bb75983e7d5bd0eddbdf40b1b569cd8..ba94e9337bd2917e6fbac71fab2a260cd7be3116 100644
GIT binary patch
delta 17552
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
C+Q-QN

delta 17570
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 6abaad43b..8dd1b5764 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 16:15+0800\n"
+"POT-Creation-Date: 2019-10-12 17:06+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -78,7 +78,7 @@ msgstr "运行参数"
 #: assets/forms/domain.py:15 assets/forms/label.py:13
 #: assets/models/asset.py:295 assets/models/authbook.py:24
 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32
-#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:31
+#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:36
 #: assets/templates/assets/admin_user_list.html:46
 #: assets/templates/assets/domain_detail.html:60
 #: assets/templates/assets/domain_list.html:26
@@ -112,8 +112,8 @@ msgstr "资产"
 #: applications/templates/applications/remote_app_detail.html:53
 #: applications/templates/applications/remote_app_list.html:20
 #: applications/templates/applications/user_remote_app_list.html:16
-#: assets/forms/asset.py:24 assets/forms/domain.py:73 assets/forms/user.py:74
-#: assets/forms/user.py:94 assets/models/base.py:28 assets/models/cluster.py:18
+#: assets/forms/asset.py:21 assets/forms/domain.py:73 assets/forms/user.py:75
+#: assets/forms/user.py:95 assets/models/base.py:28 assets/models/cluster.py:18
 #: assets/models/cmd_filter.py:21 assets/models/domain.py:20
 #: assets/models/group.py:20 assets/models/label.py:18
 #: assets/templates/assets/admin_user_detail.html:56
@@ -189,7 +189,7 @@ msgstr "参数"
 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
 #: assets/models/cmd_filter.py:59 assets/models/group.py:21
 #: assets/templates/assets/admin_user_detail.html:68
-#: assets/templates/assets/asset_detail.html:124
+#: assets/templates/assets/asset_detail.html:122
 #: assets/templates/assets/cmd_filter_detail.html:77
 #: assets/templates/assets/domain_detail.html:72
 #: assets/templates/assets/system_user_detail.html:100
@@ -243,7 +243,7 @@ msgstr "创建日期"
 #: assets/models/domain.py:53 assets/models/group.py:23
 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:50
-#: assets/templates/assets/asset_detail.html:132
+#: assets/templates/assets/asset_detail.html:130
 #: assets/templates/assets/cmd_filter_detail.html:65
 #: assets/templates/assets/cmd_filter_list.html:27
 #: assets/templates/assets/cmd_filter_rule_list.html:62
@@ -394,7 +394,7 @@ msgstr "详情"
 #: assets/templates/assets/admin_user_detail.html:24
 #: assets/templates/assets/admin_user_list.html:26
 #: assets/templates/assets/admin_user_list.html:111
-#: assets/templates/assets/asset_detail.html:27
+#: assets/templates/assets/asset_detail.html:26
 #: assets/templates/assets/asset_list.html:78
 #: assets/templates/assets/asset_list.html:167
 #: assets/templates/assets/cmd_filter_detail.html:29
@@ -440,7 +440,7 @@ msgstr "更新"
 #: applications/templates/applications/remote_app_list.html:55
 #: assets/templates/assets/admin_user_detail.html:28
 #: assets/templates/assets/admin_user_list.html:112
-#: assets/templates/assets/asset_detail.html:31
+#: assets/templates/assets/asset_detail.html:30
 #: assets/templates/assets/asset_list.html:168
 #: assets/templates/assets/cmd_filter_detail.html:33
 #: assets/templates/assets/cmd_filter_list.html:59
@@ -572,28 +572,32 @@ msgstr "不能修改根节点名称"
 msgid "Deletion failed and the node contains children or assets"
 msgstr "删除失败，节点包含子节点或资产"
 
-#: assets/api/node.py:276
+#: assets/api/node.py:273
 msgid "Update node asset hardware information: {}"
 msgstr "更新节点资产硬件信息: {}"
 
-#: assets/api/node.py:290
+#: assets/api/node.py:287
 msgid "Test if the assets under the node are connectable: {}"
 msgstr "测试节点下资产是否可连接: {}"
 
-#: assets/forms/asset.py:18
+#: assets/const.py:8
 msgid "Only Numbers、letters、 chinese and characters ( {} ) are allowed"
 msgstr "只允许包含数字、字母、中文和特殊字符（ {} ）"
 
-#: assets/forms/asset.py:28 assets/models/asset.py:140
+#: assets/const.py:14
+msgid "* The contains characters that are not allowed"
+msgstr "* 包含不被允许的字符"
+
+#: assets/forms/asset.py:25 assets/models/asset.py:140
 #: assets/models/domain.py:50
 #: assets/templates/assets/domain_gateway_list.html:69
 #: settings/templates/settings/replay_storage_create.html:59
 msgid "Port"
 msgstr "端口"
 
-#: assets/forms/asset.py:59 assets/models/asset.py:145
-#: assets/models/user.py:110 assets/templates/assets/asset_detail.html:190
-#: assets/templates/assets/asset_detail.html:198
+#: assets/forms/asset.py:56 assets/models/asset.py:145
+#: assets/models/user.py:110 assets/templates/assets/asset_detail.html:188
+#: assets/templates/assets/asset_detail.html:196
 #: assets/templates/assets/system_user_assets.html:83
 #: perms/models/asset_permission.py:81
 #: xpack/plugins/change_auth_plan/models.py:74
@@ -602,16 +606,16 @@ msgstr "端口"
 msgid "Nodes"
 msgstr "节点"
 
-#: assets/forms/asset.py:62 assets/forms/asset.py:109
+#: assets/forms/asset.py:59 assets/forms/asset.py:106
 #: assets/models/asset.py:149 assets/models/cluster.py:19
-#: assets/models/user.py:68 assets/templates/assets/asset_detail.html:76
+#: assets/models/user.py:68 assets/templates/assets/asset_detail.html:74
 #: templates/_nav.html:44 xpack/plugins/cloud/models.py:161
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:68
 #: xpack/plugins/orgs/templates/orgs/org_list.html:19
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/forms/asset.py:65 assets/forms/asset.py:112 assets/forms/asset.py:152
+#: assets/forms/asset.py:62 assets/forms/asset.py:109 assets/forms/asset.py:149
 #: assets/templates/assets/asset_create.html:48
 #: assets/templates/assets/asset_create.html:50
 #: assets/templates/assets/asset_list.html:85
@@ -619,16 +623,16 @@ msgstr "管理用户"
 msgid "Label"
 msgstr "标签"
 
-#: assets/forms/asset.py:68 assets/forms/asset.py:115
+#: assets/forms/asset.py:65 assets/forms/asset.py:112
 #: assets/models/asset.py:144 assets/models/domain.py:26
-#: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:80
+#: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:78
 #: assets/templates/assets/user_asset_list.html:53
 #: xpack/plugins/orgs/templates/orgs/org_list.html:18
 msgid "Domain"
 msgstr "网域"
 
-#: assets/forms/asset.py:72 assets/forms/asset.py:106 assets/forms/asset.py:119
-#: assets/forms/asset.py:155 assets/models/node.py:409
+#: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116
+#: assets/forms/asset.py:152 assets/models/node.py:409
 #: assets/templates/assets/asset_create.html:42
 #: perms/forms/asset_permission.py:83 perms/forms/asset_permission.py:90
 #: perms/templates/perms/asset_permission_list.html:53
@@ -643,7 +647,7 @@ msgstr "网域"
 msgid "Node"
 msgstr "节点"
 
-#: assets/forms/asset.py:77 assets/forms/asset.py:124
+#: assets/forms/asset.py:74 assets/forms/asset.py:121
 msgid ""
 "root or other NOPASSWD sudo privilege user existed in asset,If asset is "
 "windows or other set any one, more see admin user left menu"
@@ -651,16 +655,16 @@ msgstr ""
 "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一"
 "个, 更多信息查看左侧 `管理用户` 菜单"
 
-#: assets/forms/asset.py:80 assets/forms/asset.py:127
+#: assets/forms/asset.py:77 assets/forms/asset.py:124
 msgid "Windows 2016 RDP protocol is different, If is window 2016, set it"
 msgstr "Windows 2016的RDP协议与之前不同，如果是请设置"
 
-#: assets/forms/asset.py:81 assets/forms/asset.py:128
+#: assets/forms/asset.py:78 assets/forms/asset.py:125
 msgid ""
 "If your have some network not connect with each other, you can set domain"
 msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录"
 
-#: assets/forms/asset.py:135 assets/forms/asset.py:139
+#: assets/forms/asset.py:132 assets/forms/asset.py:136
 #: assets/forms/domain.py:17 assets/forms/label.py:15
 #: perms/templates/perms/asset_permission_asset.html:78
 #: xpack/plugins/change_auth_plan/forms.py:55
@@ -680,7 +684,7 @@ msgstr "不能包含特殊字符"
 msgid "SSH gateway support proxy SSH,RDP,VNC"
 msgstr "SSH网关，支持代理SSH,RDP和VNC"
 
-#: assets/forms/domain.py:74 assets/forms/user.py:75 assets/forms/user.py:95
+#: assets/forms/domain.py:74 assets/forms/user.py:76 assets/forms/user.py:96
 #: assets/models/base.py:29 assets/models/gathered_user.py:16
 #: assets/templates/assets/_asset_user_auth_update_modal.html:15
 #: assets/templates/assets/_asset_user_auth_view_modal.html:21
@@ -712,11 +716,11 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 msgid "Username"
 msgstr "用户名"
 
-#: assets/forms/user.py:25
+#: assets/forms/user.py:26
 msgid "Password or private key passphrase"
 msgstr "密码或密钥密码"
 
-#: assets/forms/user.py:26 assets/models/base.py:30
+#: assets/forms/user.py:27 assets/models/base.py:30
 #: assets/serializers/asset_user.py:63
 #: assets/templates/assets/_asset_user_auth_update_modal.html:21
 #: assets/templates/assets/_asset_user_auth_view_modal.html:27
@@ -735,31 +739,31 @@ msgstr "密码或密钥密码"
 msgid "Password"
 msgstr "密码"
 
-#: assets/forms/user.py:29 assets/serializers/asset_user.py:71
+#: assets/forms/user.py:30 assets/serializers/asset_user.py:71
 #: assets/templates/assets/_asset_user_auth_update_modal.html:27
 #: users/models/user.py:400
 msgid "Private key"
 msgstr "ssh私钥"
 
-#: assets/forms/user.py:41
+#: assets/forms/user.py:42
 msgid "Invalid private key, Only support RSA/DSA format key"
 msgstr "不合法的密钥，仅支持RSA/DSA格式的密钥"
 
-#: assets/forms/user.py:52
+#: assets/forms/user.py:53
 msgid "Password and private key file must be input one"
 msgstr "密码和私钥, 必须输入一个"
 
-#: assets/forms/user.py:97 assets/models/cmd_filter.py:32
+#: assets/forms/user.py:98 assets/models/cmd_filter.py:32
 #: assets/models/user.py:118 assets/templates/assets/_system_user.html:66
 #: assets/templates/assets/system_user_detail.html:165
 msgid "Command filter"
 msgstr "命令过滤器"
 
-#: assets/forms/user.py:101
+#: assets/forms/user.py:103
 msgid "Auto push system user to asset"
 msgstr "自动推送系统用户到资产"
 
-#: assets/forms/user.py:102
+#: assets/forms/user.py:104
 msgid ""
 "1-100, High level will be using login asset as default, if user was granted "
 "more than 2 system user"
@@ -767,13 +771,13 @@ msgstr ""
 "1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为"
 "默认登录用户"
 
-#: assets/forms/user.py:104
+#: assets/forms/user.py:106
 msgid ""
 "If you choose manual login mode, you do not need to fill in the username and "
 "password."
 msgstr "如果选择手动登录模式，用户名和密码可以不填写"
 
-#: assets/forms/user.py:106
+#: assets/forms/user.py:108
 msgid "Use comma split multi command, ex: /bin/whoami,/bin/ifconfig"
 msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig"
 
@@ -781,7 +785,7 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig"
 #: assets/serializers/asset_user.py:28
 #: assets/templates/assets/_asset_list_modal.html:47
 #: assets/templates/assets/_asset_user_list.html:20
-#: assets/templates/assets/asset_detail.html:64
+#: assets/templates/assets/asset_detail.html:62
 #: assets/templates/assets/asset_list.html:97
 #: assets/templates/assets/domain_gateway_list.html:68
 #: assets/templates/assets/user_asset_list.html:49
@@ -799,7 +803,7 @@ msgstr "IP"
 #: assets/templates/assets/_asset_user_auth_update_modal.html:9
 #: assets/templates/assets/_asset_user_auth_view_modal.html:15
 #: assets/templates/assets/_asset_user_list.html:19
-#: assets/templates/assets/asset_detail.html:60
+#: assets/templates/assets/asset_detail.html:58
 #: assets/templates/assets/asset_list.html:96
 #: assets/templates/assets/user_asset_list.html:48
 #: perms/templates/perms/asset_permission_asset.html:57
@@ -811,7 +815,7 @@ msgid "Hostname"
 msgstr "主机名"
 
 #: assets/models/asset.py:139 assets/models/domain.py:51
-#: assets/models/user.py:113 assets/templates/assets/asset_detail.html:72
+#: assets/models/user.py:113 assets/templates/assets/asset_detail.html:70
 #: assets/templates/assets/domain_gateway_list.html:70
 #: assets/templates/assets/system_user_detail.html:70
 #: assets/templates/assets/system_user_list.html:53
@@ -819,41 +823,41 @@ msgstr "主机名"
 msgid "Protocol"
 msgstr "协议"
 
-#: assets/models/asset.py:142 assets/serializers/asset.py:64
+#: assets/models/asset.py:142 assets/serializers/asset.py:68
 #: assets/templates/assets/asset_create.html:24
 #: assets/templates/assets/user_asset_list.html:50
 #: perms/serializers/user_permission.py:48
 msgid "Protocols"
 msgstr "协议组"
 
-#: assets/models/asset.py:143 assets/templates/assets/asset_detail.html:104
+#: assets/models/asset.py:143 assets/templates/assets/asset_detail.html:102
 #: assets/templates/assets/user_asset_list.html:51
 msgid "Platform"
 msgstr "系统平台"
 
 #: assets/models/asset.py:146 assets/models/authbook.py:27
 #: assets/models/cmd_filter.py:22 assets/models/domain.py:54
-#: assets/models/label.py:22 assets/templates/assets/asset_detail.html:112
+#: assets/models/label.py:22 assets/templates/assets/asset_detail.html:110
 msgid "Is active"
 msgstr "激活"
 
-#: assets/models/asset.py:152 assets/templates/assets/asset_detail.html:68
+#: assets/models/asset.py:152 assets/templates/assets/asset_detail.html:66
 msgid "Public IP"
 msgstr "公网IP"
 
-#: assets/models/asset.py:153 assets/templates/assets/asset_detail.html:120
+#: assets/models/asset.py:153 assets/templates/assets/asset_detail.html:118
 msgid "Asset number"
 msgstr "资产编号"
 
-#: assets/models/asset.py:156 assets/templates/assets/asset_detail.html:84
+#: assets/models/asset.py:156 assets/templates/assets/asset_detail.html:82
 msgid "Vendor"
 msgstr "制造商"
 
-#: assets/models/asset.py:157 assets/templates/assets/asset_detail.html:88
+#: assets/models/asset.py:157 assets/templates/assets/asset_detail.html:86
 msgid "Model"
 msgstr "型号"
 
-#: assets/models/asset.py:158 assets/templates/assets/asset_detail.html:116
+#: assets/models/asset.py:158 assets/templates/assets/asset_detail.html:114
 msgid "Serial number"
 msgstr "序列号"
 
@@ -874,7 +878,7 @@ msgstr "CPU核数"
 msgid "CPU vcpus"
 msgstr "CPU总数"
 
-#: assets/models/asset.py:164 assets/templates/assets/asset_detail.html:96
+#: assets/models/asset.py:164 assets/templates/assets/asset_detail.html:94
 msgid "Memory"
 msgstr "内存"
 
@@ -886,7 +890,7 @@ msgstr "硬盘大小"
 msgid "Disk info"
 msgstr "硬盘信息"
 
-#: assets/models/asset.py:168 assets/templates/assets/asset_detail.html:108
+#: assets/models/asset.py:168 assets/templates/assets/asset_detail.html:106
 msgid "OS"
 msgstr "操作系统"
 
@@ -903,7 +907,7 @@ msgid "Hostname raw"
 msgstr "主机名原始"
 
 #: assets/models/asset.py:173 assets/templates/assets/asset_create.html:46
-#: assets/templates/assets/asset_detail.html:224 templates/_nav.html:46
+#: assets/templates/assets/asset_detail.html:222 templates/_nav.html:46
 msgid "Labels"
 msgstr "标签管理"
 
@@ -1226,31 +1230,27 @@ msgstr "可连接"
 msgid "Unknown"
 msgstr "未知"
 
-#: assets/serializers/asset.py:22
+#: assets/serializers/asset.py:26
 msgid "Protocol format should {}/{}"
 msgstr "协议格式 {}/{}"
 
-#: assets/serializers/asset.py:39
+#: assets/serializers/asset.py:43
 msgid "Protocol duplicate: {}"
 msgstr "协议重复: {}"
 
-#: assets/serializers/asset.py:65 assets/serializers/asset_user.py:29
+#: assets/serializers/asset.py:69 assets/serializers/asset_user.py:29
 #: assets/templates/assets/_asset_user_list.html:23
 msgid "Connectivity"
 msgstr "连接"
 
-#: assets/serializers/asset.py:91
+#: assets/serializers/asset.py:95
 msgid "Hardware info"
 msgstr "硬件信息"
 
-#: assets/serializers/asset.py:92 orgs/mixins/serializers.py:27
+#: assets/serializers/asset.py:96 orgs/mixins/serializers.py:27
 msgid "Org name"
 msgstr "组织名称"
 
-#: assets/serializers/asset.py:100
-msgid "* The hostname contains characters that are not allowed"
-msgstr "* 主机名包含不被允许的字符"
-
 #: assets/serializers/asset_user.py:31
 msgid "Backend"
 msgstr "后端"
@@ -1281,15 +1281,15 @@ msgstr "值"
 msgid "The same level node name cannot be the same"
 msgstr "同级别节点名字不能重复"
 
-#: assets/serializers/system_user.py:32
+#: assets/serializers/system_user.py:37
 msgid "Login mode display"
 msgstr "登录模式显示"
 
-#: assets/serializers/system_user.py:67
+#: assets/serializers/system_user.py:81
 msgid "* Automatic login mode must fill in the username."
 msgstr "自动登录模式，必须填写用户名"
 
-#: assets/serializers/system_user.py:78
+#: assets/serializers/system_user.py:92
 msgid "Password or private key required"
 msgstr "密码或密钥密码需要一个"
 
@@ -1448,7 +1448,7 @@ msgid "Please input password"
 msgstr "请输入密码"
 
 #: assets/templates/assets/_asset_user_auth_update_modal.html:68
-#: assets/templates/assets/asset_detail.html:304
+#: assets/templates/assets/asset_detail.html:302
 #: users/templates/users/user_detail.html:313
 #: users/templates/users/user_detail.html:340
 #: xpack/plugins/interface/views.py:35
@@ -1497,7 +1497,7 @@ msgstr "查看"
 #: assets/templates/assets/_asset_user_list.html:75
 #: assets/templates/assets/admin_user_assets.html:61
 #: assets/templates/assets/asset_asset_user_list.html:57
-#: assets/templates/assets/asset_detail.html:178
+#: assets/templates/assets/asset_detail.html:176
 #: assets/templates/assets/system_user_assets.html:63
 #: assets/templates/assets/system_user_detail.html:151
 msgid "Test"
@@ -1619,7 +1619,7 @@ msgstr "快速更新"
 
 #: assets/templates/assets/admin_user_assets.html:58
 #: assets/templates/assets/asset_asset_user_list.html:54
-#: assets/templates/assets/asset_detail.html:175
+#: assets/templates/assets/asset_detail.html:173
 msgid "Test connective"
 msgstr "测试可连接性"
 
@@ -1636,7 +1636,7 @@ msgid "Select nodes"
 msgstr "选择节点"
 
 #: assets/templates/assets/admin_user_detail.html:100
-#: assets/templates/assets/asset_detail.html:204
+#: assets/templates/assets/asset_detail.html:202
 #: assets/templates/assets/asset_list.html:422
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_assets.html:97
@@ -1724,7 +1724,7 @@ msgid "Asset users of"
 msgstr "资产用户"
 
 #: assets/templates/assets/asset_asset_user_list.html:47
-#: assets/templates/assets/asset_detail.html:144
+#: assets/templates/assets/asset_detail.html:142
 #: terminal/templates/terminal/session_detail.html:85
 #: users/templates/users/user_detail.html:140
 #: users/templates/users/user_profile.html:150
@@ -1744,21 +1744,21 @@ msgstr "选择需要修改属性"
 msgid "Select all"
 msgstr "全选"
 
-#: assets/templates/assets/asset_detail.html:92
+#: assets/templates/assets/asset_detail.html:90
 msgid "CPU"
 msgstr "CPU"
 
-#: assets/templates/assets/asset_detail.html:100
+#: assets/templates/assets/asset_detail.html:98
 msgid "Disk"
 msgstr "硬盘"
 
-#: assets/templates/assets/asset_detail.html:128
+#: assets/templates/assets/asset_detail.html:126
 #: users/templates/users/user_detail.html:115
 #: users/templates/users/user_profile.html:106
 msgid "Date joined"
 msgstr "创建日期"
 
-#: assets/templates/assets/asset_detail.html:150 authentication/models.py:15
+#: assets/templates/assets/asset_detail.html:148 authentication/models.py:15
 #: authentication/templates/authentication/_access_key_modal.html:32
 #: perms/models/base.py:51
 #: perms/templates/perms/asset_permission_create_update.html:55
@@ -1772,11 +1772,11 @@ msgstr "创建日期"
 msgid "Active"
 msgstr "激活中"
 
-#: assets/templates/assets/asset_detail.html:167
+#: assets/templates/assets/asset_detail.html:165
 msgid "Refresh hardware"
 msgstr "更新硬件信息"
 
-#: assets/templates/assets/asset_detail.html:170
+#: assets/templates/assets/asset_detail.html:168
 msgid "Refresh"
 msgstr "刷新"
 

From b732f4e32c6c9e781e581c27cfc3a6f433249c86 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Sat, 12 Oct 2019 18:00:40 +0800
Subject: [PATCH 15/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=20API=20=E6=97=B6=20Connectivity=20is=20not=20JSON=20serializa?=
 =?UTF-8?q?ble=20=E7=9A=84=20Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/serializers/asset.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index 529ee1fde..f198aee76 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -140,6 +140,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
 
 
 class AssetSimpleSerializer(serializers.ModelSerializer):
+    connectivity = ConnectivitySerializer(read_only=True, label=_("Connectivity"))
 
     class Meta:
         model = Asset

From e09347535177e680eff00dd50ebed28368929e50 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 14 Oct 2019 11:37:13 +0800
Subject: [PATCH 16/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9jms=20stop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jms | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jms b/jms
index 0cf4a1171..1affac1d2 100755
--- a/jms
+++ b/jms
@@ -445,8 +445,7 @@ def stop_service(srv, sig=15):
 
 def stop_daemon_service():
     pid = get_pid('jms')
-    logging.info("Daemon pid is: {}".format(pid))
-    if pid:
+    if pid and check_pid(pid):
         os.kill(pid, 15)
 
 

From b4d164954d7ea120bc189a79d20cc8cf73c5a45d Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 14 Oct 2019 11:59:24 +0800
Subject: [PATCH 17/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E4=BB=8E=20es=20=E4=B8=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5=EF=BC=88=E5=8E=9F=E5=9B=A0=EF=BC=9A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/backends/command/es.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py
index dde8e1e95..5aa16dfbf 100644
--- a/apps/terminal/backends/command/es.py
+++ b/apps/terminal/backends/command/es.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 
+from datetime import datetime
 from jms_storage.es import ESStorage
 from .base import CommandBase
 from .models import AbstractSessionCommand
@@ -14,6 +15,13 @@ class CommandStore(ESStorage, CommandBase):
                user=None, asset=None, system_user=None,
                input=None, session=None):
 
+        if date_from is not None:
+            if isinstance(date_from, float):
+                date_from = datetime.fromtimestamp(date_from)
+        if date_to is not None:
+            if isinstance(date_to, float):
+                date_to = datetime.fromtimestamp(date_to)
+
         data = super().filter(date_from=date_from, date_to=date_to,
                               user=user, asset=asset, system_user=system_user,
                               input=input, session=session)

From 1a1f20920d63d5e4424a65a237a61779691f867a Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 14 Oct 2019 15:15:06 +0800
Subject: [PATCH 18/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=91=BD=E4=BB=A4=E7=B1=BB=E5=9E=8B=20MAPPING?=
 =?UTF-8?q?=EF=BC=88elasticsearch=20->=20es=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/backends/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/terminal/backends/__init__.py b/apps/terminal/backends/__init__.py
index 12b85b7e3..1aec6b3be 100644
--- a/apps/terminal/backends/__init__.py
+++ b/apps/terminal/backends/__init__.py
@@ -6,6 +6,7 @@ from common import utils
 
 TYPE_ENGINE_MAPPING = {
     'elasticsearch': 'terminal.backends.command.es',
+    'es': 'terminal.backends.command.es',
 }
 
 

From 01ead7c8e1429149df769f71b5c7707ce811a842 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 15 Oct 2019 12:41:29 +0800
Subject: [PATCH 19/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20=E6=97=A0=E6=95=88=E7=9A=84=20=20=E5=87=BA=E7=8E=B0500?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/models/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/perms/models/base.py b/apps/perms/models/base.py
index b36d009b3..878d9d739 100644
--- a/apps/perms/models/base.py
+++ b/apps/perms/models/base.py
@@ -29,7 +29,7 @@ class BasePermissionQuerySet(models.QuerySet):
         return self.filter(is_active=False)
 
     def invalid(self):
-        now = timezone.now
+        now = timezone.now()
         q = (
             Q(is_active=False) |
             Q(date_start__gt=now) |

From 70a4f137b8208e6863dac7ccb5a286ea69678352 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Oct 2019 16:27:22 +0800
Subject: [PATCH 20/27] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/get_no_parent_nodes.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 utils/get_no_parent_nodes.py

diff --git a/utils/get_no_parent_nodes.py b/utils/get_no_parent_nodes.py
new file mode 100644
index 000000000..e472fa4b4
--- /dev/null
+++ b/utils/get_no_parent_nodes.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+#
+
+import os
+import sys
+import django
+
+
+if os.path.exists('../apps'):
+    sys.path.insert(0, '../apps')
+elif os.path.exists('./apps'):
+    sys.path.insert(0, './apps')
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings")
+django.setup()
+
+from assets.models import *
+from orgs.utils import Organization
+
+Organization.root().change_to()
+
+ns = Node.objects.all()
+
+for i in ns:
+    try:
+        pkey = i.parent.key
+    except:
+        pkey = ''
+    if i.parent_key != pkey and not i.key.isdigit():
+        print("Node parent not found: {} -> {}".format(i.key, i.parent_key))
+

From 8fcfcf7ad3702188dd561b91f0c1f365d5a415a9 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Tue, 15 Oct 2019 17:38:48 +0800
Subject: [PATCH 21/27] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA/=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E6=98=AF=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE->=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=88=E9=81=BF=E5=85=8D=E5=BC=95?=
 =?UTF-8?q?=E8=B5=B7=E6=AD=A7=E4=B9=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 80879 -> 80879 bytes
 apps/locale/zh/LC_MESSAGES/django.po          |   9 +++++----
 .../users/user_group_create_update.html       |   2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index ba94e9337bd2917e6fbac71fab2a260cd7be3116..a4ec9786d1f2a1492a02929530dce638f9f2df02 100644
GIT binary patch
delta 22
ecmaF=o#p*^mJM6Zvzsaynp+v0Z{B_0BnJS4s|rm3

delta 22
ecmaF=o#p*^mJM6Zvl}TGnp+u|ZQgy}BnJS4YzjsI

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 8dd1b5764..79c7d4faa 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-12 17:06+0800\n"
+"POT-Creation-Date: 2019-10-15 17:37+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -310,6 +310,7 @@ msgstr "远程应用"
 #: users/templates/users/_user.html:50
 #: users/templates/users/user_bulk_update.html:23
 #: users/templates/users/user_detail.html:178
+#: users/templates/users/user_group_create_update.html:31
 #: users/templates/users/user_password_update.html:75
 #: users/templates/users/user_profile.html:209
 #: users/templates/users/user_profile_update.html:67
@@ -320,6 +321,7 @@ msgstr "远程应用"
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53
 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:44
 #: xpack/plugins/interface/templates/interface/interface.html:72
+#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
 #: xpack/plugins/vault/templates/vault/vault_create.html:45
 msgid "Reset"
 msgstr "重置"
@@ -1238,7 +1240,8 @@ msgstr "协议格式 {}/{}"
 msgid "Protocol duplicate: {}"
 msgstr "协议重复: {}"
 
-#: assets/serializers/asset.py:69 assets/serializers/asset_user.py:29
+#: assets/serializers/asset.py:69 assets/serializers/asset.py:143
+#: assets/serializers/asset_user.py:29
 #: assets/templates/assets/_asset_user_list.html:23
 msgid "Connectivity"
 msgstr "连接"
@@ -1866,11 +1869,9 @@ msgstr "删除选择资产"
 #: users/templates/users/user_detail.html:392
 #: users/templates/users/user_detail.html:418
 #: users/templates/users/user_detail.html:486
-#: users/templates/users/user_group_create_update.html:31
 #: users/templates/users/user_group_list.html:118
 #: users/templates/users/user_list.html:254
 #: xpack/plugins/interface/templates/interface/interface.html:101
-#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
 msgid "Cancel"
 msgstr "取消"
 
diff --git a/apps/users/templates/users/user_group_create_update.html b/apps/users/templates/users/user_group_create_update.html
index 1ae714618..25f027ad5 100644
--- a/apps/users/templates/users/user_group_create_update.html
+++ b/apps/users/templates/users/user_group_create_update.html
@@ -28,7 +28,7 @@
                             {% bootstrap_field form.comment layout="horizontal" %}
                             <div class="form-group">
                                 <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Cancel' %}</button>
+                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
                                     <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Confirm' %}</button>
                                 </div>
                             </div>

From ee97144a10ff1000dde30c499753cf44335c2312 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 17 Oct 2019 11:03:06 +0800
Subject: [PATCH 22/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E5=88=97=E8=A1=A8=20=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=90=9C=E7=B4=A2=E6=8A=A5500=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/api/asset_permission.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py
index 41c64c7f1..1088117e8 100644
--- a/apps/perms/api/asset_permission.py
+++ b/apps/perms/api/asset_permission.py
@@ -68,15 +68,18 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
         node_id = self.request.query_params.get('node_id')
         node_name = self.request.query_params.get('node')
         if node_id:
-            node = get_object_or_none(Node, pk=node_id)
+            nodes = Node.objects.filter(pk=node_id)
         elif node_name:
-            node = get_object_or_none(Node, name=node_name)
+            nodes = Node.objects.filter(value=node_name)
         else:
             return queryset
-        if not node:
+        if not nodes:
             return queryset.none()
-        nodes = node.get_ancestors(with_self=True)
-        queryset = queryset.filter(nodes__in=nodes)
+
+        related_nodes = []
+        for node in nodes:
+            [related_nodes.append(item) for item in node.get_ancestors(with_self=True)]
+        queryset = queryset.filter(nodes__in=related_nodes)
         return queryset
 
     def filter_asset(self, queryset):

From 70664d435f2ba80b385f2f0645822102e9a68b6a Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 17 Oct 2019 11:59:18 +0800
Subject: [PATCH 23/27] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=B0=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/api/asset_permission.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py
index 1088117e8..180878d30 100644
--- a/apps/perms/api/asset_permission.py
+++ b/apps/perms/api/asset_permission.py
@@ -68,18 +68,18 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
         node_id = self.request.query_params.get('node_id')
         node_name = self.request.query_params.get('node')
         if node_id:
-            nodes = Node.objects.filter(pk=node_id)
+            _nodes = Node.objects.filter(pk=node_id)
         elif node_name:
-            nodes = Node.objects.filter(value=node_name)
+            _nodes = Node.objects.filter(value=node_name)
         else:
             return queryset
-        if not nodes:
+        if not _nodes:
             return queryset.none()
 
-        related_nodes = []
-        for node in nodes:
-            [related_nodes.append(item) for item in node.get_ancestors(with_self=True)]
-        queryset = queryset.filter(nodes__in=related_nodes)
+        nodes = set()
+        for node in _nodes:
+            nodes |= set(node.get_ancestors(with_self=True))
+        queryset = queryset.filter(nodes__in=nodes)
         return queryset
 
     def filter_asset(self, queryset):

From f3dc9b886bbf9f59d37bce1998b5805a239d3a05 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Fri, 18 Oct 2019 15:05:45 +0800
Subject: [PATCH 24/27] Asset favor (#3352)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 拆分filter org

* [Update] 修改session支持protocol搜索

* [Bugfix] 修复判断问题

* [Update] 支持收藏资产

* [update] 修改org resource queryset

* [Update] 修改form serializer 对应的多对多字段

* [Bugfix] 修复其他组织取消收藏的bug

* [Update] 去掉debug信息

* [Update] 修改remote app get queryset

* [Update] 修改remote app get queryset

* [Update] 修改没有授权时显示情况

* [Bugfix] 修复组织管理员查看用户权限失败问题

* [Update] 优化forms assets queryset设置
---
 apps/applications/api/remote_app.py           |   8 +-
 apps/assets/api/__init__.py                   |   1 +
 apps/assets/api/admin_user.py                 |  12 +-
 apps/assets/api/asset.py                      |  14 +-
 apps/assets/api/cmd_filter.py                 |   3 +-
 apps/assets/api/domain.py                     |   5 +-
 apps/assets/api/favorite_asset.py             |  27 ++++
 apps/assets/api/gathered_user.py              |   4 +-
 apps/assets/api/label.py                      |   1 +
 apps/assets/api/node.py                       |  26 ++--
 apps/assets/api/system_user.py                |  20 +--
 apps/assets/forms/asset.py                    |   9 +-
 apps/assets/forms/domain.py                   |  20 ++-
 apps/assets/forms/label.py                    |  20 ++-
 apps/assets/migrations/0042_favoriteasset.py  |  31 ++++
 apps/assets/models/__init__.py                |   1 +
 apps/assets/models/favorite_asset.py          |  20 +++
 apps/assets/models/node.py                    |  24 ++-
 apps/assets/serializers/__init__.py           |   1 +
 apps/assets/serializers/admin_user.py         |   2 +-
 apps/assets/serializers/asset_user.py         |   2 +-
 apps/assets/serializers/favorite_asset.py     |  23 +++
 apps/assets/serializers/node.py               |   6 +-
 .../templates/assets/asset_bulk_update.html   |   8 +
 .../templates/assets/user_asset_list.html     |  80 +++++++---
 apps/assets/urls/api_urls.py                  |   1 +
 apps/audits/api.py                            |   8 +-
 apps/common/api.py                            |   2 -
 apps/common/mixins/models.py                  |  17 ++-
 apps/common/signals_handlers.py               |   2 +-
 apps/common/tree.py                           |   2 +
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 80879 -> 80914 bytes
 apps/locale/zh/LC_MESSAGES/django.po          | 138 +++++++++---------
 apps/orgs/mixins/api.py                       |  14 +-
 apps/orgs/mixins/generics.py                  |  41 ++++++
 apps/orgs/mixins/models.py                    |  56 +++----
 apps/orgs/utils.py                            |  28 ++++
 apps/perms/api/asset_permission.py            |  38 ++---
 apps/perms/api/mixin.py                       |  24 ++-
 apps/perms/api/remote_app_permission.py       |  15 +-
 apps/perms/api/user_permission/mixin.py       |   2 +-
 apps/perms/api/user_remote_app_permission.py  |  10 +-
 apps/perms/hands.py                           |   9 +-
 apps/perms/utils/asset_permission.py          |  17 ++-
 apps/static/js/jumpserver.js                  |  14 +-
 apps/terminal/api/session.py                  |   4 +-
 .../templates/terminal/session_list.html      |   1 +
 apps/users/api/group.py                       |   7 +-
 apps/users/api/user.py                        |  39 +++--
 apps/users/forms.py                           |  35 ++---
 apps/users/serializers/v1.py                  |  26 +++-
 .../templates/users/_granted_assets.html      |  30 +++-
 .../templates/users/user_bulk_update.html     |   1 +
 .../users/user_group_granted_asset.html       |   2 +-
 apps/users/utils.py                           |   4 +
 55 files changed, 656 insertions(+), 299 deletions(-)
 create mode 100644 apps/assets/api/favorite_asset.py
 create mode 100644 apps/assets/migrations/0042_favoriteasset.py
 create mode 100644 apps/assets/models/favorite_asset.py
 create mode 100644 apps/assets/serializers/favorite_asset.py
 create mode 100644 apps/orgs/mixins/generics.py

diff --git a/apps/applications/api/remote_app.py b/apps/applications/api/remote_app.py
index 83b1d490a..79beef8fc 100644
--- a/apps/applications/api/remote_app.py
+++ b/apps/applications/api/remote_app.py
@@ -1,10 +1,8 @@
 # coding: utf-8
 #
 
-
-from rest_framework import generics
-
 from orgs.mixins.api import OrgBulkModelViewSet
+from orgs.mixins import generics
 from ..hands import IsOrgAdmin, IsAppUser
 from ..models import RemoteApp
 from ..serializers import RemoteAppSerializer, RemoteAppConnectionInfoSerializer
@@ -16,14 +14,14 @@ __all__ = [
 
 
 class RemoteAppViewSet(OrgBulkModelViewSet):
+    model = RemoteApp
     filter_fields = ('name',)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
-    queryset = RemoteApp.objects.all()
     serializer_class = RemoteAppSerializer
 
 
 class RemoteAppConnectionInfoApi(generics.RetrieveAPIView):
-    queryset = RemoteApp.objects.all()
+    model = RemoteApp
     permission_classes = (IsAppUser, )
     serializer_class = RemoteAppConnectionInfoSerializer
diff --git a/apps/assets/api/__init__.py b/apps/assets/api/__init__.py
index a4404e290..e7126878d 100644
--- a/apps/assets/api/__init__.py
+++ b/apps/assets/api/__init__.py
@@ -7,3 +7,4 @@ from .domain import *
 from .cmd_filter import *
 from .asset_user import *
 from .gathered_user import *
+from .favorite_asset import *
diff --git a/apps/assets/api/admin_user.py b/apps/assets/api/admin_user.py
index fd10e6129..b91f10c65 100644
--- a/apps/assets/api/admin_user.py
+++ b/apps/assets/api/admin_user.py
@@ -15,11 +15,10 @@
 
 from django.db import transaction
 from django.shortcuts import get_object_or_404
-from rest_framework import generics
 from rest_framework.response import Response
 from orgs.mixins.api import OrgBulkModelViewSet
+from orgs.mixins import generics
 
-from common.mixins import CommonApiMixin
 from common.utils import get_logger
 from ..hands import IsOrgAdmin
 from ..models import AdminUser, Asset
@@ -39,22 +38,21 @@ class AdminUserViewSet(OrgBulkModelViewSet):
     """
     Admin user api set, for add,delete,update,list,retrieve resource
     """
-
+    model = AdminUser
     filter_fields = ("name", "username")
     search_fields = filter_fields
-    queryset = AdminUser.objects.all()
     serializer_class = serializers.AdminUserSerializer
     permission_classes = (IsOrgAdmin,)
 
 
 class AdminUserAuthApi(generics.UpdateAPIView):
-    queryset = AdminUser.objects.all()
+    model = AdminUser
     serializer_class = serializers.AdminUserAuthSerializer
     permission_classes = (IsOrgAdmin,)
 
 
 class ReplaceNodesAdminUserApi(generics.UpdateAPIView):
-    queryset = AdminUser.objects.all()
+    model = AdminUser
     serializer_class = serializers.ReplaceNodeAdminUserSerializer
     permission_classes = (IsOrgAdmin,)
 
@@ -79,7 +77,7 @@ class AdminUserTestConnectiveApi(generics.RetrieveAPIView):
     """
     Test asset admin user assets_connectivity
     """
-    queryset = AdminUser.objects.all()
+    model = AdminUser
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.TaskIDSerializer
 
diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py
index 39341328b..64fdc16dc 100644
--- a/apps/assets/api/asset.py
+++ b/apps/assets/api/asset.py
@@ -3,14 +3,14 @@
 
 import random
 
-from rest_framework import generics
 from rest_framework.response import Response
 from django.shortcuts import get_object_or_404
 
 from common.utils import get_logger, get_object_or_none
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
 from orgs.mixins.api import OrgBulkModelViewSet
-from ..models import Asset, AdminUser, Node
+from orgs.mixins import generics
+from ..models import Asset, Node
 from .. import serializers
 from ..tasks import update_asset_hardware_info_manual, \
     test_asset_connectivity_manual
@@ -29,10 +29,10 @@ class AssetViewSet(OrgBulkModelViewSet):
     """
     API endpoint that allows Asset to be viewed or edited.
     """
+    model = Asset
     filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id")
     search_fields = ("hostname", "ip")
     ordering_fields = ("hostname", "ip", "port", "cpu_cores")
-    queryset = Asset.objects.all()
     serializer_class = serializers.AssetSerializer
     permission_classes = (IsOrgAdminOrAppUser,)
     extra_filter_backends = [AssetByNodeFilterBackend, LabelFilterBackend]
@@ -57,7 +57,7 @@ class AssetRefreshHardwareApi(generics.RetrieveAPIView):
     """
     Refresh asset hardware info
     """
-    queryset = Asset.objects.all()
+    model = Asset
     serializer_class = serializers.AssetSerializer
     permission_classes = (IsOrgAdmin,)
 
@@ -72,7 +72,7 @@ class AssetAdminUserTestApi(generics.RetrieveAPIView):
     """
     Test asset admin user assets_connectivity
     """
-    queryset = Asset.objects.all()
+    model = Asset
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.TaskIDSerializer
 
@@ -84,9 +84,9 @@ class AssetAdminUserTestApi(generics.RetrieveAPIView):
 
 
 class AssetGatewayApi(generics.RetrieveAPIView):
-    queryset = Asset.objects.all()
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.GatewayWithAuthSerializer
+    model = Asset
 
     def retrieve(self, request, *args, **kwargs):
         asset_id = kwargs.get('pk')
@@ -98,4 +98,4 @@ class AssetGatewayApi(generics.RetrieveAPIView):
             serializer = serializers.GatewayWithAuthSerializer(instance=gateway)
             return Response(serializer.data)
         else:
-            return Response({"msg": "Not have gateway"}, status=404)
\ No newline at end of file
+            return Response({"msg": "Not have gateway"}, status=404)
diff --git a/apps/assets/api/cmd_filter.py b/apps/assets/api/cmd_filter.py
index 846172548..b4ae67c72 100644
--- a/apps/assets/api/cmd_filter.py
+++ b/apps/assets/api/cmd_filter.py
@@ -13,14 +13,15 @@ __all__ = ['CommandFilterViewSet', 'CommandFilterRuleViewSet']
 
 
 class CommandFilterViewSet(OrgBulkModelViewSet):
+    model = CommandFilter
     filter_fields = ("name",)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
-    queryset = CommandFilter.objects.all()
     serializer_class = serializers.CommandFilterSerializer
 
 
 class CommandFilterRuleViewSet(OrgBulkModelViewSet):
+    model = CommandFilterRule
     filter_fields = ("content",)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
diff --git a/apps/assets/api/domain.py b/apps/assets/api/domain.py
index 03c4c2307..13be62315 100644
--- a/apps/assets/api/domain.py
+++ b/apps/assets/api/domain.py
@@ -15,7 +15,7 @@ __all__ = ['DomainViewSet', 'GatewayViewSet', "GatewayTestConnectionApi"]
 
 
 class DomainViewSet(OrgBulkModelViewSet):
-    queryset = Domain.objects.all()
+    model = Domain
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.DomainSerializer
 
@@ -26,16 +26,15 @@ class DomainViewSet(OrgBulkModelViewSet):
 
 
 class GatewayViewSet(OrgBulkModelViewSet):
+    model = Gateway
     filter_fields = ("domain__name", "name", "username", "ip", "domain")
     search_fields = filter_fields
-    queryset = Gateway.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.GatewaySerializer
 
 
 class GatewayTestConnectionApi(SingleObjectMixin, APIView):
     permission_classes = (IsOrgAdmin,)
-    model = Gateway
     object = None
 
     def post(self, request, *args, **kwargs):
diff --git a/apps/assets/api/favorite_asset.py b/apps/assets/api/favorite_asset.py
new file mode 100644
index 000000000..174c77330
--- /dev/null
+++ b/apps/assets/api/favorite_asset.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+#
+from rest_framework_bulk import BulkModelViewSet
+
+from common.permissions import IsValidUser
+from orgs.utils import tmp_to_root_org
+from ..models import FavoriteAsset
+from ..serializers import FavoriteAssetSerializer
+
+__all__ = ['FavoriteAssetViewSet']
+
+
+class FavoriteAssetViewSet(BulkModelViewSet):
+    serializer_class = FavoriteAssetSerializer
+    permission_classes = (IsValidUser,)
+    filter_fields = ['asset']
+
+    def dispatch(self, request, *args, **kwargs):
+        with tmp_to_root_org():
+            return super().dispatch(request, *args, **kwargs)
+
+    def get_queryset(self):
+        queryset = FavoriteAsset.objects.filter(user=self.request.user)
+        return queryset
+
+    def allow_bulk_destroy(self, qs, filtered):
+        return filtered.count() == 1
diff --git a/apps/assets/api/gathered_user.py b/apps/assets/api/gathered_user.py
index 038d47208..b9f137648 100644
--- a/apps/assets/api/gathered_user.py
+++ b/apps/assets/api/gathered_user.py
@@ -13,12 +13,10 @@ __all__ = ['GatheredUserViewSet']
 
 
 class GatheredUserViewSet(OrgModelViewSet):
-    queryset = GatheredUser.objects.all()
+    model = GatheredUser
     serializer_class = GatheredUserSerializer
     permission_classes = [IsOrgAdmin]
     extra_filter_backends = [AssetRelatedByNodeFilterBackend]
 
     filter_fields = ['asset', 'username', 'present']
     search_fields = ['username', 'asset__ip', 'asset__hostname']
-
-
diff --git a/apps/assets/api/label.py b/apps/assets/api/label.py
index c3b798959..fe298169a 100644
--- a/apps/assets/api/label.py
+++ b/apps/assets/api/label.py
@@ -27,6 +27,7 @@ __all__ = ['LabelViewSet']
 
 
 class LabelViewSet(OrgBulkModelViewSet):
+    model = Label
     filter_fields = ("name", "value")
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py
index a48d5f00d..1451650d2 100644
--- a/apps/assets/api/node.py
+++ b/apps/assets/api/node.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from rest_framework import generics, status
+from rest_framework import status
 from rest_framework.serializers import ValidationError
 from rest_framework.views import APIView
 from rest_framework.response import Response
@@ -23,9 +23,12 @@ from django.shortcuts import get_object_or_404
 from common.utils import get_logger, get_object_or_none
 from common.tree import TreeNodeSerializer
 from orgs.mixins.api import OrgModelViewSet
+from orgs.mixins import generics
 from ..hands import IsOrgAdmin
 from ..models import Node
-from ..tasks import update_assets_hardware_info_util, test_asset_connectivity_util
+from ..tasks import (
+    update_assets_hardware_info_util, test_asset_connectivity_util
+)
 from .. import serializers
 
 
@@ -40,9 +43,9 @@ __all__ = [
 
 
 class NodeViewSet(OrgModelViewSet):
+    model = Node
     filter_fields = ('value', 'key', 'id')
     search_fields = ('value', )
-    queryset = Node.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.NodeSerializer
 
@@ -79,6 +82,7 @@ class NodeListAsTreeApi(generics.ListAPIView):
       }
     ]
     """
+    model = Node
     permission_classes = (IsOrgAdmin,)
     serializer_class = TreeNodeSerializer
 
@@ -87,10 +91,6 @@ class NodeListAsTreeApi(generics.ListAPIView):
         queryset = [node.as_tree_node() for node in queryset]
         return queryset
 
-    def get_queryset(self):
-        queryset = Node.objects.all()
-        return queryset
-
     def filter_queryset(self, queryset):
         queryset = super().filter_queryset(queryset)
         queryset = self.to_tree_queryset(queryset)
@@ -98,7 +98,6 @@ class NodeListAsTreeApi(generics.ListAPIView):
 
 
 class NodeChildrenApi(generics.ListCreateAPIView):
-    queryset = Node.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.NodeSerializer
     instance = None
@@ -162,6 +161,7 @@ class NodeChildrenAsTreeApi(NodeChildrenApi):
     ]
 
     """
+    model = Node
     serializer_class = TreeNodeSerializer
     http_method_names = ['get']
 
@@ -204,7 +204,7 @@ class NodeAssetsApi(generics.ListAPIView):
 
 
 class NodeAddChildrenApi(generics.UpdateAPIView):
-    queryset = Node.objects.all()
+    model = Node
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.NodeAddChildrenSerializer
     instance = None
@@ -221,8 +221,8 @@ class NodeAddChildrenApi(generics.UpdateAPIView):
 
 
 class NodeAddAssetsApi(generics.UpdateAPIView):
+    model = Node
     serializer_class = serializers.NodeAssetsSerializer
-    queryset = Node.objects.all()
     permission_classes = (IsOrgAdmin,)
     instance = None
 
@@ -233,8 +233,8 @@ class NodeAddAssetsApi(generics.UpdateAPIView):
 
 
 class NodeRemoveAssetsApi(generics.UpdateAPIView):
+    model = Node
     serializer_class = serializers.NodeAssetsSerializer
-    queryset = Node.objects.all()
     permission_classes = (IsOrgAdmin,)
     instance = None
 
@@ -249,8 +249,8 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView):
 
 
 class NodeReplaceAssetsApi(generics.UpdateAPIView):
+    model = Node
     serializer_class = serializers.NodeAssetsSerializer
-    queryset = Node.objects.all()
     permission_classes = (IsOrgAdmin,)
     instance = None
 
@@ -262,8 +262,8 @@ class NodeReplaceAssetsApi(generics.UpdateAPIView):
 
 
 class RefreshNodeHardwareInfoApi(APIView):
-    permission_classes = (IsOrgAdmin,)
     model = Node
+    permission_classes = (IsOrgAdmin,)
 
     def get(self, request, *args, **kwargs):
         node_id = kwargs.get('pk')
diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py
index 9b87ed9aa..5bf38853d 100644
--- a/apps/assets/api/system_user.py
+++ b/apps/assets/api/system_user.py
@@ -14,13 +14,13 @@
 # limitations under the License.
 
 from django.shortcuts import get_object_or_404
-from rest_framework import generics
 from rest_framework.response import Response
 
 from common.serializers import CeleryTaskSerializer
 from common.utils import get_logger
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
 from orgs.mixins.api import OrgBulkModelViewSet
+from orgs.mixins import generics
 from ..models import SystemUser, Asset
 from .. import serializers
 from ..tasks import (
@@ -43,22 +43,18 @@ class SystemUserViewSet(OrgBulkModelViewSet):
     """
     System user api set, for add,delete,update,list,retrieve resource
     """
+    model = SystemUser
     filter_fields = ("name", "username")
     search_fields = filter_fields
-    queryset = SystemUser.objects.all()
     serializer_class = serializers.SystemUserSerializer
     permission_classes = (IsOrgAdminOrAppUser,)
 
-    def get_queryset(self):
-        queryset = super().get_queryset().all()
-        return queryset
-
 
 class SystemUserAuthInfoApi(generics.RetrieveUpdateDestroyAPIView):
     """
     Get system user auth info
     """
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.SystemUserAuthSerializer
 
@@ -72,7 +68,7 @@ class SystemUserAssetAuthInfoApi(generics.RetrieveAPIView):
     """
     Get system user with asset auth info
     """
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.SystemUserAuthSerializer
 
@@ -88,7 +84,7 @@ class SystemUserPushApi(generics.RetrieveAPIView):
     """
     Push system user to cluster assets api
     """
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdmin,)
     serializer_class = CeleryTaskSerializer
 
@@ -105,7 +101,7 @@ class SystemUserTestConnectiveApi(generics.RetrieveAPIView):
     """
     Push system user to cluster assets api
     """
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdmin,)
     serializer_class = CeleryTaskSerializer
 
@@ -132,7 +128,7 @@ class SystemUserAssetsListView(generics.ListAPIView):
 
 
 class SystemUserPushToAssetApi(generics.RetrieveAPIView):
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.TaskIDSerializer
 
@@ -145,7 +141,7 @@ class SystemUserPushToAssetApi(generics.RetrieveAPIView):
 
 
 class SystemUserTestAssetConnectivityApi(generics.RetrieveAPIView):
-    queryset = SystemUser.objects.all()
+    model = SystemUser
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.TaskIDSerializer
 
diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index d3d64d602..b6e5d3a42 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -129,7 +129,7 @@ class AssetUpdateForm(OrgModelForm):
 class AssetBulkUpdateForm(OrgModelForm):
     assets = forms.ModelMultipleChoiceField(
         required=True,
-        label=_('Select assets'), queryset=Asset.objects.all(),
+        label=_('Select assets'), queryset=Asset.objects,
         widget=forms.SelectMultiple(
             attrs={
                 'class': 'select2',
@@ -155,11 +155,18 @@ class AssetBulkUpdateForm(OrgModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
+
         # 重写其他字段为不再required
         for name, field in self.fields.items():
             if name != 'assets':
                 field.required = False
 
+    def set_fields_queryset(self):
+        assets_field = self.fields['assets']
+        if hasattr(self, 'data'):
+            assets_field.queryset = Asset.objects.all()
+
     def save(self, commit=True):
         changed_fields = []
         for field in self._meta.fields:
diff --git a/apps/assets/forms/domain.py b/apps/assets/forms/domain.py
index 496147a99..71d9f6cfa 100644
--- a/apps/assets/forms/domain.py
+++ b/apps/assets/forms/domain.py
@@ -12,7 +12,7 @@ __all__ = ['DomainForm', 'GatewayForm']
 
 class DomainForm(forms.ModelForm):
     assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects.all(), label=_('Asset'), required=False,
+        queryset=Asset.objects, label=_('Asset'), required=False,
         widget=forms.SelectMultiple(
             attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
         )
@@ -23,19 +23,23 @@ class DomainForm(forms.ModelForm):
         fields = ['name', 'comment', 'assets']
 
     def __init__(self, *args, **kwargs):
-        if kwargs.get('instance', None):
-            initial = kwargs.get('initial', {})
-            initial['assets'] = kwargs['instance'].assets.all()
         super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
 
-        # 前端渲染优化, 防止过多资产
+    def set_fields_queryset(self):
         assets_field = self.fields.get('assets')
+
+        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
         if not self.data:
-            instance = kwargs.get('instance')
-            if instance:
-                assets_field.queryset = instance.assets.all()
+            # 有instance 代表渲染更新表单, 否则是创建表单
+            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
+            if self.instance:
+                assets_field.initial = self.instance.assets.all()
+                assets_field.queryset = self.instance.assets.all()
             else:
                 assets_field.queryset = Asset.objects.none()
+        else:
+            assets_field.queryset = Asset.objects.all()
 
     def save(self, commit=True):
         instance = super().save(commit=commit)
diff --git a/apps/assets/forms/label.py b/apps/assets/forms/label.py
index 8a5a54e4a..1f2f13987 100644
--- a/apps/assets/forms/label.py
+++ b/apps/assets/forms/label.py
@@ -10,7 +10,7 @@ __all__ = ['LabelForm']
 
 class LabelForm(forms.ModelForm):
     assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects.all(), label=_('Asset'), required=False,
+        queryset=Asset.objects.none(), label=_('Asset'), required=False,
         widget=forms.SelectMultiple(
             attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
         )
@@ -21,19 +21,23 @@ class LabelForm(forms.ModelForm):
         fields = ['name', 'value', 'assets']
 
     def __init__(self, *args, **kwargs):
-        if kwargs.get('instance', None):
-            initial = kwargs.get('initial', {})
-            initial['assets'] = kwargs['instance'].assets.all()
         super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
 
-        # 前端渲染优化, 防止过多资产
+    def set_fields_queryset(self):
         assets_field = self.fields.get('assets')
+
+        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
         if not self.data:
-            instance = kwargs.get('instance')
-            if instance:
-                assets_field.queryset = instance.assets.all()
+            # 有instance 代表渲染更新表单, 否则是创建表单
+            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
+            if self.instance:
+                assets_field.initial = self.instance.assets.all()
+                assets_field.queryset = self.instance.assets.all()
             else:
                 assets_field.queryset = Asset.objects.none()
+        else:
+            assets_field.queryset = Asset.objects.all()
 
     def save(self, commit=True):
         label = super().save(commit=commit)
diff --git a/apps/assets/migrations/0042_favoriteasset.py b/apps/assets/migrations/0042_favoriteasset.py
new file mode 100644
index 000000000..3baebee74
--- /dev/null
+++ b/apps/assets/migrations/0042_favoriteasset.py
@@ -0,0 +1,31 @@
+# Generated by Django 2.2.5 on 2019-10-16 08:38
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('assets', '0041_gathereduser'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='FavoriteAsset',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
+                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
+                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
+                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Asset')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('user', 'asset')},
+            },
+        ),
+    ]
diff --git a/apps/assets/models/__init__.py b/apps/assets/models/__init__.py
index c69f19bf6..db9c54aed 100644
--- a/apps/assets/models/__init__.py
+++ b/apps/assets/models/__init__.py
@@ -10,3 +10,4 @@ from .authbook import *
 from .utils import *
 from .authbook import *
 from .gathered_user import *
+from .favorite_asset import *
diff --git a/apps/assets/models/favorite_asset.py b/apps/assets/models/favorite_asset.py
new file mode 100644
index 000000000..3abc69c8c
--- /dev/null
+++ b/apps/assets/models/favorite_asset.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+from django.db import models
+
+from common.mixins.models import CommonModelMixin
+
+
+__all__ = ['FavoriteAsset']
+
+
+class FavoriteAsset(CommonModelMixin):
+    user = models.ForeignKey('users.User', on_delete=models.CASCADE)
+    asset = models.ForeignKey('assets.Asset', on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = ('user', 'asset')
+
+    @classmethod
+    def get_user_favorite_assets_id(cls, user):
+        return cls.objects.filter(user=user).values_list('asset', flat=True)
diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index 71e1d4a24..dd1f706f2 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -324,6 +324,8 @@ class SomeNodesMixin:
     ungrouped_value = _('ungrouped')
     empty_key = '-11'
     empty_value = _("empty")
+    favorite_key = '-12'
+    favorite_value = _("favorite")
 
     def is_default_node(self):
         return self.key == self.default_key
@@ -363,7 +365,7 @@ class SomeNodesMixin:
     @classmethod
     def ungrouped_node(cls):
         with tmp_to_org(Organization.system()):
-            defaults = {'value': cls.ungrouped_key}
+            defaults = {'value': cls.ungrouped_value}
             obj, created = cls.objects.get_or_create(
                 defaults=defaults, key=cls.ungrouped_key
             )
@@ -387,11 +389,21 @@ class SomeNodesMixin:
             )
             return obj
 
+    @classmethod
+    def favorite_node(cls):
+        with tmp_to_org(Organization.system()):
+            defaults = {'value': cls.favorite_value}
+            obj, created = cls.objects.get_or_create(
+                defaults=defaults, key=cls.favorite_key
+            )
+            return obj
+
     @classmethod
     def initial_some_nodes(cls):
         cls.default_node()
         cls.empty_node()
         cls.ungrouped_node()
+        cls.favorite_node()
 
 
 class Node(OrgModelMixin, SomeNodesMixin, TreeMixin, FamilyMixin, FullValueMixin, NodeAssetsMixin):
@@ -412,11 +424,11 @@ class Node(OrgModelMixin, SomeNodesMixin, TreeMixin, FamilyMixin, FullValueMixin
     def __str__(self):
         return self.value
 
-    def __eq__(self, other):
-        if not other:
-            return False
-        return self.id == other.id
-
+    # def __eq__(self, other):
+    #     if not other:
+    #         return False
+    #     return self.id == other.id
+    #
     def __gt__(self, other):
         self_key = [int(k) for k in self.key.split(':')]
         other_key = [int(k) for k in other.key.split(':')]
diff --git a/apps/assets/serializers/__init__.py b/apps/assets/serializers/__init__.py
index 9c86ef407..2c3e9fbd4 100644
--- a/apps/assets/serializers/__init__.py
+++ b/apps/assets/serializers/__init__.py
@@ -10,3 +10,4 @@ from .domain import *
 from .cmd_filter import *
 from .asset_user import *
 from .gathered_user import *
+from .favorite_asset import *
diff --git a/apps/assets/serializers/admin_user.py b/apps/assets/serializers/admin_user.py
index 918f1d9bf..63aac8cc0 100644
--- a/apps/assets/serializers/admin_user.py
+++ b/apps/assets/serializers/admin_user.py
@@ -45,7 +45,7 @@ class ReplaceNodeAdminUserSerializer(serializers.ModelSerializer):
     管理用户更新关联到的集群
     """
     nodes = serializers.PrimaryKeyRelatedField(
-        many=True, queryset=Node.objects.all()
+        many=True, queryset=Node.objects
     )
 
     class Meta:
diff --git a/apps/assets/serializers/asset_user.py b/apps/assets/serializers/asset_user.py
index a93d2b2c3..18b5ea982 100644
--- a/apps/assets/serializers/asset_user.py
+++ b/apps/assets/serializers/asset_user.py
@@ -79,7 +79,7 @@ class AssetUserAuthInfoSerializer(serializers.ModelSerializer):
 
 
 class AssetUserPushSerializer(serializers.Serializer):
-    asset = serializers.PrimaryKeyRelatedField(queryset=Asset.objects.all(), label=_("Asset"))
+    asset = serializers.PrimaryKeyRelatedField(queryset=Asset.objects, label=_("Asset"))
     username = serializers.CharField(max_length=1024)
 
     def create(self, validated_data):
diff --git a/apps/assets/serializers/favorite_asset.py b/apps/assets/serializers/favorite_asset.py
new file mode 100644
index 000000000..8429d959e
--- /dev/null
+++ b/apps/assets/serializers/favorite_asset.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+#
+
+from rest_framework import serializers
+
+from orgs.utils import tmp_to_root_org
+from common.serializers import AdaptedBulkListSerializer
+from common.mixins import BulkSerializerMixin
+from ..models import FavoriteAsset
+
+
+__all__ = ['FavoriteAssetSerializer']
+
+
+class FavoriteAssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
+    user = serializers.HiddenField(
+        default=serializers.CurrentUserDefault()
+    )
+
+    class Meta:
+        list_serializer_class = AdaptedBulkListSerializer
+        model = FavoriteAsset
+        fields = ['user', 'asset']
diff --git a/apps/assets/serializers/node.py b/apps/assets/serializers/node.py
index 10a7a52d1..79e07df13 100644
--- a/apps/assets/serializers/node.py
+++ b/apps/assets/serializers/node.py
@@ -38,8 +38,10 @@ class NodeSerializer(BulkOrgResourceModelSerializer):
         return data
 
 
-class NodeAssetsSerializer(serializers.ModelSerializer):
-    assets = serializers.PrimaryKeyRelatedField(many=True, queryset=Asset.objects.all())
+class NodeAssetsSerializer(BulkOrgResourceModelSerializer):
+    assets = serializers.PrimaryKeyRelatedField(
+        many=True, queryset=Asset.objects
+    )
 
     class Meta:
         model = Node
diff --git a/apps/assets/templates/assets/asset_bulk_update.html b/apps/assets/templates/assets/asset_bulk_update.html
index 2dd0d8660..08df48e91 100644
--- a/apps/assets/templates/assets/asset_bulk_update.html
+++ b/apps/assets/templates/assets/asset_bulk_update.html
@@ -25,12 +25,20 @@
         </div>
     </div>
 </form>
+{% include 'assets/_asset_list_modal.html' %}
 {% endblock %}
 
 {% block custom_foot_js %}
 <script>
     $(document).ready(function () {
         $('.select2').select2();
+        $("#id_assets").parent().find(".select2-selection").on('click', function (e) {
+            if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
+                e.preventDefault();
+                e.stopPropagation();
+                $("#asset_list_modal").modal();
+            }
+        })
     }).on('click', '.field-tag', function() {
         changeField(this);
     }).on('click', '#change_all', function () {
diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index 7e452eaf6..9d3853480 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -21,19 +21,46 @@
 
 {% block custom_foot_js %}
 <script>
-var treeUrl = "{% url 'api-perms:my-nodes-children-as-tree' %}?&cache_policy=1";
+var treeUrl = "{% url 'api-perms:my-nodes-children-as-tree' %}?cache_policy=1";
 var assetTableUrl = "{% url 'api-perms:my-assets' %}?cache_policy=1";
 var selectUrl = '{% url "api-perms:my-node-assets" node_id=DEFAULT_PK %}?cache_policy=1&all=1';
 var systemUsersUrl = "{% url 'api-perms:my-asset-system-users' asset_id=DEFAULT_PK %}?cache_policy=1";
 var showAssetHref = false; // Need input default true
+
+var favoriteAssets = [];
+var favorBtnTmpl = '<a class="btn btn-xs btn-default btn-favor" data-id="ID"><i class="fa fa-star-o"></i></a>';
+var disfavorBtnTmpl = '<a class="btn btn-xs btn-default btn-disfavor" data-id="ID"><i class="fa fa-star"></i></a>';
 var actions = {
     targets: 4, createdCell: function (td, cellData) {
-       var conn_btn = '<a href="{% url "luna-view" %}?login_to=' + cellData +
-           '" class="btn btn-xs btn-primary" target="_blank">{% trans "Connect" %}</a>';
-       $(td).html(conn_btn)
+       var connBtn = '<a href="{% url "luna-view" %}?login_to=' + cellData +
+           '" class="btn btn-xs btn-primary" target="_blank"><i class="fa fa-terminal"></i></a> ';
+       var favorBtn = favorBtnTmpl.replace("ID", cellData);
+       var disfavorBtn = disfavorBtnTmpl.replace("ID", cellData);
+
+       var btn = connBtn;
+       if (favoriteAssets.indexOf(cellData) === -1) {
+           btn += favorBtn
+       } else {
+           btn += disfavorBtn;
+       }
+
+       $(td).html(btn)
 }};
 $(document).ready(function () {
-    initTree();
+    requestApi({
+        method: "GET",
+        url: "{% url 'api-assets:favorite-asset-list' %}",
+        success: function (data) {
+            favoriteAssets = data.map(function (i) {
+                return i.asset;
+            });
+            initTree();
+        },
+        error: function () {
+            initTree();
+        },
+        flash_message: false
+     })
 }).on('click', '.labels li', function () {
     var val = $(this).text();
     $("#user_assets_table_filter input").val(val);
@@ -67,22 +94,33 @@ $(document).ready(function () {
     };
     $('#asset_detail_tbody').html(trs)
     $('#user_asset_detail_modal').modal();
+})
+.on('click', '.btn-favor', function () {
+    var $this = $(this);
+    var assetId = $(this).data("id");
+    requestApi({
+        url: "{% url 'api-assets:favorite-asset-list' %}",
+        method: "POST",
+        body: JSON.stringify({asset: assetId}),
+        flash_message: false,
+        success: function (data) {
+            var btn = disfavorBtnTmpl.replace("ID", assetId);
+            $this.replaceWith(btn)
+        }
+    });
+})
+.on('click', '.btn-disfavor', function () {
+    var $this = $(this);
+    var assetId = $(this).data("id");
+    requestApi({
+        url: "{% url 'api-assets:favorite-asset-list' %}?asset=" + assetId,
+        method: "DELETE",
+        flash_message: false,
+        success: function (data) {
+            var btn = favorBtnTmpl.replace("ID", assetId);
+            $this.replaceWith(btn)
+        }
+    });
 });
-
-function toggle() {
-    if (show === 0) {
-        $("#split-left").hide(500, function () {
-            $("#split-right").attr("class", "col-lg-12");
-            $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
-            show = 1;
-        });
-    } else {
-        $("#split-right").attr("class", "col-lg-9");
-        $("#toggle-icon").attr("class", "fa fa-angle-left fa-x");
-        $("#split-left").show(500);
-        show = 0;
-    }
-}
-
 </script>
 {% endblock %}
diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py
index 46ea16483..35651429b 100644
--- a/apps/assets/urls/api_urls.py
+++ b/apps/assets/urls/api_urls.py
@@ -22,6 +22,7 @@ router.register(r'cmd-filters', api.CommandFilterViewSet, 'cmd-filter')
 router.register(r'asset-users', api.AssetUserViewSet, 'asset-user')
 router.register(r'asset-users-info', api.AssetUserExportViewSet, 'asset-user-info')
 router.register(r'gathered-users', api.GatheredUserViewSet, 'gathered-user')
+router.register(r'favorite-assets', api.FavoriteAssetViewSet, 'favorite-asset')
 
 cmd_filter_router = routers.NestedDefaultRouter(router, r'cmd-filters', lookup='filter')
 cmd_filter_router.register(r'rules', api.CommandFilterRuleViewSet, 'cmd-filter-rule')
diff --git a/apps/audits/api.py b/apps/audits/api.py
index 626749b29..4d7165b4b 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 
-from rest_framework import viewsets
-
 from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor
+from orgs.mixins.api import OrgModelViewSet
 from .models import FTPLog
 from .serializers import FTPLogSerializer
 
 
-class FTPLogViewSet(viewsets.ModelViewSet):
-    queryset = FTPLog.objects.all()
+class FTPLogViewSet(OrgModelViewSet):
+    model = FTPLog
     serializer_class = FTPLogSerializer
     permission_classes = (IsOrgAdminOrAppUser | IsOrgAuditor,)
+
diff --git a/apps/common/api.py b/apps/common/api.py
index 4c5d28254..d69540cfd 100644
--- a/apps/common/api.py
+++ b/apps/common/api.py
@@ -83,8 +83,6 @@ class LogTailApi(generics.RetrieveAPIView):
         return Response({"data": data, 'end': end, 'mark': new_mark})
 
 
-
-
 class ResourcesIDCacheApi(APIView):
     def post(self, request, *args, **kwargs):
         spm = str(uuid.uuid4())
diff --git a/apps/common/mixins/models.py b/apps/common/mixins/models.py
index d4af23896..df3d899e0 100644
--- a/apps/common/mixins/models.py
+++ b/apps/common/mixins/models.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-
+import uuid
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
 
-__all__ = ["NoDeleteManager", "NoDeleteModelMixin", "NoDeleteQuerySet"]
+__all__ = [
+    "NoDeleteManager", "NoDeleteModelMixin", "NoDeleteQuerySet",
+    "CommonModelMixin"
+]
 
 
 class NoDeleteQuerySet(models.query.QuerySet):
@@ -40,3 +43,13 @@ class NoDeleteModelMixin(models.Model):
         self.is_discard = True
         self.discard_time = timezone.now()
         return self.save()
+
+
+class CommonModelMixin(models.Model):
+    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
+    created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by'))
+    date_created = models.DateTimeField(auto_now_add=True, null=True, blank=True, verbose_name=_('Date created'))
+    date_updated = models.DateTimeField(auto_now=True, verbose_name=_('Date updated'))
+
+    class Meta:
+        abstract = True
diff --git a/apps/common/signals_handlers.py b/apps/common/signals_handlers.py
index e7dd728c3..1fbfd536f 100644
--- a/apps/common/signals_handlers.py
+++ b/apps/common/signals_handlers.py
@@ -36,7 +36,7 @@ def on_request_finished_logging_db_query(sender, **kwargs):
     queries = connection.queries
     counters = defaultdict(Counter)
     for query in queries:
-        if not query['sql'].startswith('SELECT'):
+        if not query['sql'] or not query['sql'].startswith('SELECT'):
             continue
         tables = pattern.findall(query['sql'])
         table_name = ''.join(tables)
diff --git a/apps/common/tree.py b/apps/common/tree.py
index e73b43aa6..a9da1482f 100644
--- a/apps/common/tree.py
+++ b/apps/common/tree.py
@@ -51,6 +51,8 @@ class TreeNode:
             result = True
         elif self.pId != other.pId:
             result = self.pId > other.pId
+        elif self.id.startswith('-') and not other.id.startswith('-'):
+            result = False
         else:
             result = self.name > other.name
         return result
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index a4ec9786d1f2a1492a02929530dce638f9f2df02..62707d10805f7b734067ee4bc83b8bed3d839c0e 100644
GIT binary patch
delta 17908
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

delta 17855
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 79c7d4faa..f282f0c22 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-15 17:37+0800\n"
+"POT-Creation-Date: 2019-10-17 16:09+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -193,11 +193,11 @@ msgstr "参数"
 #: assets/templates/assets/cmd_filter_detail.html:77
 #: assets/templates/assets/domain_detail.html:72
 #: assets/templates/assets/system_user_detail.html:100
-#: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:16
-#: perms/models/base.py:54
+#: common/mixins/models.py:50 ops/templates/ops/adhoc_detail.html:86
+#: orgs/models.py:16 perms/models/base.py:54
 #: perms/templates/perms/asset_permission_detail.html:98
 #: perms/templates/perms/remote_app_permission_detail.html:90
-#: users/models/user.py:414 users/serializers/v1.py:141
+#: users/models/user.py:414 users/serializers/v1.py:143
 #: users/templates/users/user_detail.html:111
 #: xpack/plugins/change_auth_plan/models.py:108
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
@@ -216,7 +216,8 @@ msgstr "创建者"
 #: assets/models/label.py:25 assets/templates/assets/admin_user_detail.html:64
 #: assets/templates/assets/cmd_filter_detail.html:69
 #: assets/templates/assets/domain_detail.html:68
-#: assets/templates/assets/system_user_detail.html:96 ops/models/adhoc.py:45
+#: assets/templates/assets/system_user_detail.html:96
+#: common/mixins/models.py:51 ops/models/adhoc.py:45
 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64
 #: orgs/models.py:17 perms/models/base.py:55
 #: perms/templates/perms/asset_permission_detail.html:94
@@ -321,7 +322,6 @@ msgstr "远程应用"
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53
 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:44
 #: xpack/plugins/interface/templates/interface/interface.html:72
-#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
 #: xpack/plugins/vault/templates/vault/vault_create.html:45
 msgid "Reset"
 msgstr "重置"
@@ -524,7 +524,7 @@ msgstr "创建远程应用"
 #: settings/templates/settings/terminal_setting.html:107
 #: terminal/templates/terminal/session_list.html:36
 #: terminal/templates/terminal/terminal_list.html:36
-#: users/templates/users/_granted_assets.html:29
+#: users/templates/users/_granted_assets.html:34
 #: users/templates/users/user_group_list.html:38
 #: users/templates/users/user_list.html:41
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60
@@ -539,7 +539,6 @@ msgid "Action"
 msgstr "动作"
 
 #: applications/templates/applications/user_remote_app_list.html:52
-#: assets/templates/assets/user_asset_list.html:32
 #: perms/models/asset_permission.py:32
 msgid "Connect"
 msgstr "连接"
@@ -566,11 +565,11 @@ msgstr "远程应用详情"
 msgid "My RemoteApp"
 msgstr "我的远程应用"
 
-#: assets/api/node.py:58
+#: assets/api/node.py:61
 msgid "You can't update the root node name"
 msgstr "不能修改根节点名称"
 
-#: assets/api/node.py:65
+#: assets/api/node.py:68
 msgid "Deletion failed and the node contains children or assets"
 msgstr "删除失败，节点包含子节点或资产"
 
@@ -628,13 +627,13 @@ msgstr "标签"
 #: assets/forms/asset.py:65 assets/forms/asset.py:112
 #: assets/models/asset.py:144 assets/models/domain.py:26
 #: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:78
-#: assets/templates/assets/user_asset_list.html:53
+#: assets/templates/assets/user_asset_list.html:80
 #: xpack/plugins/orgs/templates/orgs/org_list.html:18
 msgid "Domain"
 msgstr "网域"
 
 #: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116
-#: assets/forms/asset.py:152 assets/models/node.py:409
+#: assets/forms/asset.py:152 assets/models/node.py:421
 #: assets/templates/assets/asset_create.html:42
 #: perms/forms/asset_permission.py:83 perms/forms/asset_permission.py:90
 #: perms/templates/perms/asset_permission_list.html:53
@@ -702,7 +701,7 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:70
 #: perms/templates/perms/asset_permission_user.html:55
 #: perms/templates/perms/remote_app_permission_user.html:54
-#: settings/templates/settings/_ldap_list_users_modal.html:30 users/forms.py:14
+#: settings/templates/settings/_ldap_list_users_modal.html:30 users/forms.py:13
 #: users/models/user.py:371 users/templates/users/_select_user_modal.html:14
 #: users/templates/users/user_detail.html:67
 #: users/templates/users/user_list.html:36
@@ -729,7 +728,7 @@ msgstr "密码或密钥密码"
 #: authentication/forms.py:15
 #: authentication/templates/authentication/login.html:68
 #: authentication/templates/authentication/new_login.html:95
-#: settings/forms.py:114 users/forms.py:16 users/forms.py:28
+#: settings/forms.py:114 users/forms.py:15 users/forms.py:27
 #: users/templates/users/reset_password.html:53
 #: users/templates/users/user_password_authentication.html:18
 #: users/templates/users/user_password_update.html:44
@@ -790,10 +789,10 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig"
 #: assets/templates/assets/asset_detail.html:62
 #: assets/templates/assets/asset_list.html:97
 #: assets/templates/assets/domain_gateway_list.html:68
-#: assets/templates/assets/user_asset_list.html:49
+#: assets/templates/assets/user_asset_list.html:76
 #: audits/templates/audits/login_log_list.html:60
 #: perms/templates/perms/asset_permission_asset.html:58 settings/forms.py:144
-#: users/templates/users/_granted_assets.html:26
+#: users/templates/users/_granted_assets.html:31
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:54
 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:73
 msgid "IP"
@@ -807,10 +806,10 @@ msgstr "IP"
 #: assets/templates/assets/_asset_user_list.html:19
 #: assets/templates/assets/asset_detail.html:58
 #: assets/templates/assets/asset_list.html:96
-#: assets/templates/assets/user_asset_list.html:48
+#: assets/templates/assets/user_asset_list.html:75
 #: perms/templates/perms/asset_permission_asset.html:57
 #: perms/templates/perms/asset_permission_list.html:73 settings/forms.py:143
-#: users/templates/users/_granted_assets.html:25
+#: users/templates/users/_granted_assets.html:30
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:53
 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:72
 msgid "Hostname"
@@ -822,18 +821,19 @@ msgstr "主机名"
 #: assets/templates/assets/system_user_detail.html:70
 #: assets/templates/assets/system_user_list.html:53
 #: terminal/templates/terminal/session_list.html:31
+#: terminal/templates/terminal/session_list.html:75
 msgid "Protocol"
 msgstr "协议"
 
 #: assets/models/asset.py:142 assets/serializers/asset.py:68
 #: assets/templates/assets/asset_create.html:24
-#: assets/templates/assets/user_asset_list.html:50
+#: assets/templates/assets/user_asset_list.html:77
 #: perms/serializers/user_permission.py:48
 msgid "Protocols"
 msgstr "协议组"
 
 #: assets/models/asset.py:143 assets/templates/assets/asset_detail.html:102
-#: assets/templates/assets/user_asset_list.html:51
+#: assets/templates/assets/user_asset_list.html:78
 msgid "Platform"
 msgstr "系统平台"
 
@@ -940,7 +940,8 @@ msgid "SSH public key"
 msgstr "ssh公钥"
 
 #: assets/models/base.py:35 assets/models/gathered_user.py:21
-#: assets/templates/assets/cmd_filter_detail.html:73 ops/models/adhoc.py:46
+#: assets/templates/assets/cmd_filter_detail.html:73 common/mixins/models.py:52
+#: ops/models/adhoc.py:46
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109
 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:76
 msgid "Date updated"
@@ -1107,9 +1108,9 @@ msgstr "默认资产组"
 #: terminal/models.py:156 terminal/templates/terminal/command_list.html:29
 #: terminal/templates/terminal/command_list.html:65
 #: terminal/templates/terminal/session_list.html:27
-#: terminal/templates/terminal/session_list.html:71 users/forms.py:312
+#: terminal/templates/terminal/session_list.html:71 users/forms.py:319
 #: users/models/user.py:127 users/models/user.py:143 users/models/user.py:500
-#: users/serializers/v1.py:130 users/templates/users/user_group_detail.html:78
+#: users/serializers/v1.py:132 users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:36 users/views/user.py:250
 #: xpack/plugins/orgs/forms.py:28
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113
@@ -1117,7 +1118,7 @@ msgstr "默认资产组"
 msgid "User"
 msgstr "用户"
 
-#: assets/models/label.py:19 assets/models/node.py:400
+#: assets/models/label.py:19 assets/models/node.py:412
 #: assets/templates/assets/label_list.html:15 settings/models.py:30
 msgid "Value"
 msgstr "值"
@@ -1138,7 +1139,11 @@ msgstr "未分组"
 msgid "empty"
 msgstr "空"
 
-#: assets/models/node.py:399
+#: assets/models/node.py:328
+msgid "favorite"
+msgstr "收藏夹"
+
+#: assets/models/node.py:411
 msgid "Key"
 msgstr "键"
 
@@ -1192,7 +1197,7 @@ msgstr "Shell"
 msgid "Login mode"
 msgstr "登录模式"
 
-#: assets/models/user.py:162 assets/templates/assets/user_asset_list.html:52
+#: assets/models/user.py:162 assets/templates/assets/user_asset_list.html:79
 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:52
 #: audits/templates/audits/ftp_log_list.html:75
 #: perms/forms/asset_permission.py:86 perms/forms/remote_app_permission.py:43
@@ -1208,7 +1213,7 @@ msgstr "登录模式"
 #: terminal/templates/terminal/command_list.html:67
 #: terminal/templates/terminal/session_list.html:29
 #: terminal/templates/terminal/session_list.html:73
-#: users/templates/users/_granted_assets.html:27
+#: users/templates/users/_granted_assets.html:32
 #: xpack/plugins/orgs/templates/orgs/org_list.html:20
 msgid "System user"
 msgstr "系统用户"
@@ -1258,7 +1263,7 @@ msgstr "组织名称"
 msgid "Backend"
 msgstr "后端"
 
-#: assets/serializers/asset_user.py:67 users/forms.py:263
+#: assets/serializers/asset_user.py:67 users/forms.py:262
 #: users/models/user.py:403 users/templates/users/first_login.html:42
 #: users/templates/users/user_password_update.html:49
 #: users/templates/users/user_profile.html:69
@@ -1872,6 +1877,7 @@ msgstr "删除选择资产"
 #: users/templates/users/user_group_list.html:118
 #: users/templates/users/user_list.html:254
 #: xpack/plugins/interface/templates/interface/interface.html:101
+#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
 msgid "Cancel"
 msgstr "取消"
 
@@ -2257,7 +2263,7 @@ msgstr "Agent"
 
 #: audits/models.py:85 audits/templates/audits/login_log_list.html:62
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms.py:175 users/models/user.py:395
+#: users/forms.py:174 users/models/user.py:395
 #: users/templates/users/first_login.html:45
 msgid "MFA"
 msgstr "MFA"
@@ -2480,7 +2486,7 @@ msgid ""
 "after {} minutes)"
 msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）"
 
-#: authentication/forms.py:66 users/forms.py:22
+#: authentication/forms.py:66 users/forms.py:21
 msgid "MFA code"
 msgstr "MFA 验证码"
 
@@ -2505,7 +2511,7 @@ msgid "Secret"
 msgstr "密文"
 
 #: authentication/templates/authentication/_access_key_modal.html:48
-#: users/templates/users/_granted_assets.html:75
+#: users/templates/users/_granted_assets.html:80
 msgid "Show"
 msgstr "显示"
 
@@ -2713,11 +2719,11 @@ msgstr ""
 msgid "Encrypt field using Secret Key"
 msgstr ""
 
-#: common/mixins/models.py:31
+#: common/mixins/models.py:34
 msgid "is discard"
 msgstr ""
 
-#: common/mixins/models.py:32
+#: common/mixins/models.py:35
 msgid "discard time"
 msgstr ""
 
@@ -3105,7 +3111,7 @@ msgstr "命令执行列表"
 msgid "Command execution"
 msgstr "命令执行"
 
-#: orgs/mixins/models.py:61 orgs/mixins/serializers.py:26 orgs/models.py:31
+#: orgs/mixins/models.py:58 orgs/mixins/serializers.py:26 orgs/models.py:31
 msgid "Organization"
 msgstr "组织"
 
@@ -3122,7 +3128,7 @@ msgstr "空"
 #: perms/templates/perms/asset_permission_list.html:71
 #: perms/templates/perms/asset_permission_list.html:118
 #: perms/templates/perms/remote_app_permission_list.html:16
-#: templates/_nav.html:21 users/forms.py:286 users/models/group.py:26
+#: templates/_nav.html:21 users/forms.py:293 users/models/group.py:26
 #: users/models/user.py:379 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:218
 #: users/templates/users/user_list.html:38
@@ -3969,7 +3975,7 @@ msgid "Commercial support"
 msgstr "商业支持"
 
 #: templates/_header_bar.html:70 templates/_nav.html:30
-#: templates/_nav_user.html:32 users/forms.py:154
+#: templates/_nav_user.html:32 users/forms.py:153
 #: users/templates/users/_user.html:43
 #: users/templates/users/first_login.html:39
 #: users/templates/users/user_password_update.html:40
@@ -4390,7 +4396,7 @@ msgstr "线程数"
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:162 terminal/templates/terminal/session_list.html:136
+#: terminal/models.py:162 terminal/templates/terminal/session_list.html:137
 msgid "Replay"
 msgstr "回放"
 
@@ -4456,15 +4462,15 @@ msgstr "终断所选"
 msgid "Confirm finished"
 msgstr "确认已完成"
 
-#: terminal/templates/terminal/session_list.html:91
+#: terminal/templates/terminal/session_list.html:92
 msgid "Terminate task send, waiting ..."
 msgstr "终断任务已发送，请等待"
 
-#: terminal/templates/terminal/session_list.html:142
+#: terminal/templates/terminal/session_list.html:143
 msgid "Terminate"
 msgstr "终断"
 
-#: terminal/templates/terminal/session_list.html:173
+#: terminal/templates/terminal/session_list.html:174
 msgid "Finish session success"
 msgstr "标记会话完成成功"
 
@@ -4534,7 +4540,7 @@ msgstr "你可以使用ssh客户端工具连接终端"
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 
-#: users/forms.py:33 users/models/user.py:383
+#: users/forms.py:32 users/models/user.py:383
 #: users/templates/users/_select_user_modal.html:15
 #: users/templates/users/user_detail.html:87
 #: users/templates/users/user_list.html:37
@@ -4542,44 +4548,44 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 msgid "Role"
 msgstr "角色"
 
-#: users/forms.py:36 users/forms.py:233
+#: users/forms.py:35 users/forms.py:232
 #: users/templates/users/user_update.html:30
 msgid "ssh public key"
 msgstr "ssh公钥"
 
-#: users/forms.py:37 users/forms.py:234
+#: users/forms.py:36 users/forms.py:233
 msgid "ssh-rsa AAAA..."
 msgstr ""
 
-#: users/forms.py:38
+#: users/forms.py:37
 msgid "Paste user id_rsa.pub here."
 msgstr "复制用户公钥到这里"
 
-#: users/forms.py:52 users/templates/users/user_detail.html:226
+#: users/forms.py:51 users/templates/users/user_detail.html:226
 msgid "Join user groups"
 msgstr "添加到用户组"
 
-#: users/forms.py:87 users/forms.py:248
+#: users/forms.py:86 users/forms.py:247
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
-#: users/forms.py:91 users/forms.py:252 users/serializers/v1.py:116
+#: users/forms.py:90 users/forms.py:251 users/serializers/v1.py:116
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"
 
-#: users/forms.py:104 users/views/login.py:114 users/views/user.py:287
+#: users/forms.py:103 users/views/login.py:114 users/views/user.py:287
 msgid "* Your password does not meet the requirements"
 msgstr "* 您的密码不符合要求"
 
-#: users/forms.py:125
+#: users/forms.py:124
 msgid "Reset link will be generated and sent to the user"
 msgstr "生成重置密码链接，通过邮件发送给用户"
 
-#: users/forms.py:126
+#: users/forms.py:125
 msgid "Set password"
 msgstr "设置密码"
 
-#: users/forms.py:133 xpack/plugins/change_auth_plan/models.py:88
+#: users/forms.py:132 xpack/plugins/change_auth_plan/models.py:88
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57
@@ -4587,7 +4593,7 @@ msgstr "设置密码"
 msgid "Password strategy"
 msgstr "密码策略"
 
-#: users/forms.py:160
+#: users/forms.py:159
 msgid ""
 "When enabled, you will enter the MFA binding process the next time you log "
 "in. you can also directly bind in \"personal information -> quick "
@@ -4596,11 +4602,11 @@ msgstr ""
 "启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修改->更"
 "改MFA设置）中直接绑定！"
 
-#: users/forms.py:170
+#: users/forms.py:169
 msgid "* Enable MFA authentication to make the account more secure."
 msgstr "* 启用MFA认证，使账号更加安全。"
 
-#: users/forms.py:180
+#: users/forms.py:179
 msgid ""
 "In order to protect you and your company, please keep your account, password "
 "and key sensitive information properly. (for example: setting complex "
@@ -4609,41 +4615,41 @@ msgstr ""
 "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如："
 "设置复杂密码，启用MFA认证）"
 
-#: users/forms.py:187 users/templates/users/first_login.html:48
+#: users/forms.py:186 users/templates/users/first_login.html:48
 #: users/templates/users/first_login.html:110
 #: users/templates/users/first_login.html:139
 msgid "Finish"
 msgstr "完成"
 
-#: users/forms.py:193
+#: users/forms.py:192
 msgid "Old password"
 msgstr "原来密码"
 
-#: users/forms.py:198
+#: users/forms.py:197
 msgid "New password"
 msgstr "新密码"
 
-#: users/forms.py:203
+#: users/forms.py:202
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: users/forms.py:213
+#: users/forms.py:212
 msgid "Old password error"
 msgstr "原来密码错误"
 
-#: users/forms.py:221
+#: users/forms.py:220
 msgid "Password does not match"
 msgstr "密码不一致"
 
-#: users/forms.py:231
+#: users/forms.py:230
 msgid "Automatically configure and download the SSH key"
 msgstr "自动配置并下载SSH密钥"
 
-#: users/forms.py:235
+#: users/forms.py:234
 msgid "Paste your id_rsa.pub here."
 msgstr "复制你的公钥到这里"
 
-#: users/forms.py:269 users/forms.py:274 users/forms.py:316
+#: users/forms.py:268 users/forms.py:273 users/forms.py:323
 #: xpack/plugins/orgs/forms.py:18
 msgid "Select users"
 msgstr "选择用户"
@@ -4736,7 +4742,7 @@ msgstr "角色只能为 {}"
 msgid "Password does not match security rules"
 msgstr "密码不满足安全规则"
 
-#: users/serializers/v1.py:147
+#: users/serializers/v1.py:157
 msgid "Auditors cannot be join in the user group"
 msgstr "审计员不能被加入到用户组"
 
@@ -5933,7 +5939,7 @@ msgstr "更新同步实例任务"
 #: xpack/plugins/gathered_user/views.py:21
 #: xpack/plugins/gathered_user/views.py:34
 #: xpack/plugins/gathered_user/views.py:49
-#: xpack/plugins/gathered_user/views.py:66
+#: xpack/plugins/gathered_user/views.py:69
 msgid "Gathered user"
 msgstr "收集用户"
 
@@ -5968,7 +5974,7 @@ msgstr "创建任务"
 msgid "Gathered user list"
 msgstr "收集用户列表"
 
-#: xpack/plugins/gathered_user/views.py:67
+#: xpack/plugins/gathered_user/views.py:70
 msgid "Update task"
 msgstr "更新任务"
 
diff --git a/apps/orgs/mixins/api.py b/apps/orgs/mixins/api.py
index 9de7f2c7d..8fb7f30dd 100644
--- a/apps/orgs/mixins/api.py
+++ b/apps/orgs/mixins/api.py
@@ -5,12 +5,12 @@ from rest_framework.viewsets import ModelViewSet
 from rest_framework_bulk import BulkModelViewSet
 from common.mixins import CommonApiMixin
 
-from ..utils import set_to_root_org
+from ..utils import set_to_root_org, filter_org_queryset
 from ..models import Organization
 
 __all__ = [
     'RootOrgViewMixin', 'OrgMembershipModelViewSetMixin', 'OrgModelViewSet',
-    'OrgBulkModelViewSet',
+    'OrgBulkModelViewSet', 'OrgQuerySetMixin',
 ]
 
 
@@ -22,7 +22,15 @@ class RootOrgViewMixin:
 
 class OrgQuerySetMixin:
     def get_queryset(self):
-        queryset = super().get_queryset().all()
+        if hasattr(self, 'model'):
+            queryset = self.model.objects.all()
+        else:
+            assert self.queryset is None, (
+                    "'%s' should not include a `queryset` attribute"
+                    % self.__class__.__name__
+            )
+            queryset = super().get_queryset()
+
         if hasattr(self, 'swagger_fake_view'):
             return queryset[:1]
         if hasattr(self, 'action') and self.action == 'list' and \
diff --git a/apps/orgs/mixins/generics.py b/apps/orgs/mixins/generics.py
new file mode 100644
index 000000000..490ee1b87
--- /dev/null
+++ b/apps/orgs/mixins/generics.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#
+from rest_framework import generics
+
+from .api import OrgQuerySetMixin
+
+
+class ListAPIView(OrgQuerySetMixin, generics.ListAPIView):
+    pass
+
+
+class RetrieveAPIView(OrgQuerySetMixin, generics.RetrieveAPIView):
+    pass
+
+
+class CreateAPIView(OrgQuerySetMixin, generics.CreateAPIView):
+    pass
+
+
+class DestroyAPIView(OrgQuerySetMixin, generics.DestroyAPIView):
+    pass
+
+
+class ListCreateAPIView(OrgQuerySetMixin, generics.ListCreateAPIView):
+    pass
+
+
+class UpdateAPIView(OrgQuerySetMixin, generics.UpdateAPIView):
+    pass
+
+
+class RetrieveUpdateAPIView(OrgQuerySetMixin, generics.RetrieveUpdateAPIView):
+    pass
+
+
+class RetrieveDestroyAPIView(OrgQuerySetMixin, generics.RetrieveDestroyAPIView):
+    pass
+
+
+class RetrieveUpdateDestroyAPIView(OrgQuerySetMixin, generics.RetrieveUpdateDestroyAPIView):
+    pass
diff --git a/apps/orgs/mixins/models.py b/apps/orgs/mixins/models.py
index 672b975dc..4ffa24c2a 100644
--- a/apps/orgs/mixins/models.py
+++ b/apps/orgs/mixins/models.py
@@ -9,6 +9,7 @@ from django.core.exceptions import ValidationError
 from common.utils import get_logger
 from ..utils import (
     set_current_org, get_current_org, current_org,
+    get_org_filters
 )
 from ..models import Organization
 
@@ -19,42 +20,38 @@ __all__ = [
 ]
 
 
+class OrgQuerySet(models.QuerySet):
+    pass
+
+
 class OrgManager(models.Manager):
-
     def get_queryset(self):
-        queryset = super(OrgManager, self).get_queryset()
-        kwargs = {}
-
-        _current_org = get_current_org()
-        if _current_org is None:
-            kwargs['id'] = None
-        elif _current_org.is_real():
-            kwargs['org_id'] = _current_org.id
-        elif _current_org.is_default():
-            queryset = queryset.filter(org_id="")
-        #
-        # lines = traceback.format_stack()
-        # print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>")
-        # for line in lines[-10:-1]:
-        #     print(line)
-        # print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
-
-        queryset = queryset.filter(**kwargs)
+        queryset = super().get_queryset()
+        kwargs = get_org_filters()
+        if kwargs:
+            return queryset.filter(**kwargs)
         return queryset
 
-    def all(self):
-        if not current_org:
-            msg = 'You can `objects.set_current_org(org).all()` then run it'
-            return self
-        else:
-            return super(OrgManager, self).all()
-
     def set_current_org(self, org):
         if isinstance(org, str):
             org = Organization.get_instance(org)
         set_current_org(org)
         return self
 
+    def all(self):
+        # print("Call all: {}".format(current_org))
+        #
+        # lines = traceback.format_stack()
+        # print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+        # for line in lines[-10:-1]:
+        #     print(line)
+        # print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+        if not current_org:
+            msg = 'You can `objects.set_current_org(org).all()` then run it'
+            return self
+        else:
+            return super().all()
+
 
 class OrgModelMixin(models.Model):
     org_id = models.CharField(max_length=36, blank=True, default='',
@@ -65,9 +62,12 @@ class OrgModelMixin(models.Model):
 
     def save(self, *args, **kwargs):
         org = get_current_org()
-        if org is not None and (org.is_real() or org.is_system()):
+        if org is None:
+            return super().save(*args, **kwargs)
+
+        if org.is_real() or org.is_system():
             self.org_id = org.id
-        elif org is not None and org.is_default():
+        elif org.is_default():
             self.org_id = ''
         return super().save(*args, **kwargs)
 
diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py
index 8fca26e35..2a7cfca6b 100644
--- a/apps/orgs/utils.py
+++ b/apps/orgs/utils.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+import traceback
 from werkzeug.local import LocalProxy
 from contextlib import contextmanager
 
@@ -82,4 +83,31 @@ def tmp_to_org(org):
         set_current_org(ori_org)
 
 
+def get_org_filters():
+    kwargs = {}
+
+    _current_org = get_current_org()
+    if _current_org is None:
+        return kwargs
+
+    if _current_org.is_real():
+        kwargs['org_id'] = _current_org.id
+    elif _current_org.is_default():
+        kwargs["org_id"] = ''
+    return kwargs
+
+
+def filter_org_queryset(queryset):
+    kwargs = get_org_filters()
+
+    #
+    # lines = traceback.format_stack()
+    # print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+    # for line in lines[-10:-1]:
+    #     print(line)
+    # print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+    queryset = queryset.filter(**kwargs)
+    return queryset
+
+
 current_org = LocalProxy(get_current_org)
diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py
index 41c64c7f1..68f01d2e3 100644
--- a/apps/perms/api/asset_permission.py
+++ b/apps/perms/api/asset_permission.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 
-from django.utils import timezone
 from django.db.models import Q
 from rest_framework.views import Response
 from django.shortcuts import get_object_or_404
-from rest_framework.generics import RetrieveUpdateAPIView, ListAPIView
-from rest_framework import viewsets
 
 from common.permissions import IsOrgAdmin
+from orgs.mixins.api import OrgModelViewSet
+from orgs.mixins import generics
 from common.utils import get_object_or_none
 from ..models import AssetPermission
 from ..hands import (
@@ -24,15 +23,21 @@ __all__ = [
 ]
 
 
-class AssetPermissionViewSet(viewsets.ModelViewSet):
+class AssetPermissionViewSet(OrgModelViewSet):
     """
     资产授权列表的增删改查api
     """
-    queryset = AssetPermission.objects.all()
+    model = AssetPermission
     serializer_class = serializers.AssetPermissionCreateUpdateSerializer
     filter_fields = ['name']
     permission_classes = (IsOrgAdmin,)
 
+    def get_queryset(self):
+        queryset = super().get_queryset().prefetch_related(
+            "nodes", "assets", "users", "user_groups", "system_users"
+        )
+        return queryset
+
     def get_serializer_class(self):
         if self.action in ("list", 'retrieve') and \
                 self.request.query_params.get("display"):
@@ -160,19 +165,14 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
         queryset = queryset.distinct()
         return queryset
 
-    def get_queryset(self):
-        return self.queryset.all().prefetch_related(
-            "nodes", "assets", "users", "user_groups", "system_users"
-        )
 
-
-class AssetPermissionRemoveUserApi(RetrieveUpdateAPIView):
+class AssetPermissionRemoveUserApi(generics.RetrieveUpdateAPIView):
     """
     将用户从授权中移除，Detail页面会调用
     """
+    model = AssetPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionUpdateUserSerializer
-    queryset = AssetPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -187,10 +187,10 @@ class AssetPermissionRemoveUserApi(RetrieveUpdateAPIView):
             return Response({"error": serializer.errors})
 
 
-class AssetPermissionAddUserApi(RetrieveUpdateAPIView):
+class AssetPermissionAddUserApi(generics.RetrieveUpdateAPIView):
+    model = AssetPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionUpdateUserSerializer
-    queryset = AssetPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -205,13 +205,13 @@ class AssetPermissionAddUserApi(RetrieveUpdateAPIView):
             return Response({"error": serializer.errors})
 
 
-class AssetPermissionRemoveAssetApi(RetrieveUpdateAPIView):
+class AssetPermissionRemoveAssetApi(generics.RetrieveUpdateAPIView):
     """
     将用户从授权中移除，Detail页面会调用
     """
+    model = AssetPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionUpdateAssetSerializer
-    queryset = AssetPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -226,10 +226,10 @@ class AssetPermissionRemoveAssetApi(RetrieveUpdateAPIView):
             return Response({"error": serializer.errors})
 
 
-class AssetPermissionAddAssetApi(RetrieveUpdateAPIView):
+class AssetPermissionAddAssetApi(generics.RetrieveUpdateAPIView):
+    model = AssetPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionUpdateAssetSerializer
-    queryset = AssetPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -244,7 +244,7 @@ class AssetPermissionAddAssetApi(RetrieveUpdateAPIView):
             return Response({"error": serializer.errors})
 
 
-class AssetPermissionAssetsApi(ListAPIView):
+class AssetPermissionAssetsApi(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionAssetsSerializer
     filter_fields = ("hostname", "ip")
diff --git a/apps/perms/api/mixin.py b/apps/perms/api/mixin.py
index 85db529a0..86e1a8c0a 100644
--- a/apps/perms/api/mixin.py
+++ b/apps/perms/api/mixin.py
@@ -4,7 +4,7 @@
 from rest_framework.generics import get_object_or_404
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser
 from common.utils import get_logger
-from orgs.utils import set_to_root_org
+from orgs.utils import set_to_root_org, get_current_org, set_current_org, tmp_to_root_org
 from ..hands import User, UserGroup
 
 
@@ -17,15 +17,24 @@ __all__ = [
 
 class UserPermissionMixin:
     permission_classes = (IsOrgAdminOrAppUser,)
+    current_org = None
     obj = None
 
     def initial(self, *args, **kwargs):
         super().initial(*args, *kwargs)
+        self.current_org = get_current_org()
+        set_to_root_org()
         self.obj = self.get_obj()
 
-    def get(self, request, *args, **kwargs):
-        set_to_root_org()
-        return super().get(request, *args, **kwargs)
+    # def dispatch(self, request, *args, **kwargs):
+    #     """不能这么做，校验权限时拿不到组织了"""
+    #     with tmp_to_root_org():
+    #         return super().dispatch(request, *args, **kwargs)
+
+    # def get(self, request, *args, **kwargs):
+    #     """有的api重写了get方法"""
+    #     with tmp_to_root_org():
+    #         return super().get(request, *args, **kwargs)
 
     def get_obj(self):
         user_id = self.kwargs.get('pk', '')
@@ -40,6 +49,13 @@ class UserPermissionMixin:
             self.permission_classes = (IsValidUser,)
         return super().get_permissions()
 
+    def finalize_response(self, request, response, *args, **kwargs):
+        response = super().finalize_response(request, response, *args, **kwargs)
+        org = getattr(self, 'current_org', None)
+        if org:
+            set_current_org(org)
+        return response
+
 
 class UserGroupPermissionMixin:
     obj = None
diff --git a/apps/perms/api/remote_app_permission.py b/apps/perms/api/remote_app_permission.py
index 12b1ebfb6..6ced7f0ae 100644
--- a/apps/perms/api/remote_app_permission.py
+++ b/apps/perms/api/remote_app_permission.py
@@ -1,10 +1,11 @@
 #  coding: utf-8
 #
 
-from rest_framework import viewsets, generics
 from rest_framework.views import Response
 
 from common.permissions import IsOrgAdmin
+from orgs.mixins.api import OrgModelViewSet
+from orgs.mixins import generics
 from ..models import RemoteAppPermission
 from ..serializers import (
     RemoteAppPermissionSerializer,
@@ -20,18 +21,18 @@ __all__ = [
 ]
 
 
-class RemoteAppPermissionViewSet(viewsets.ModelViewSet):
+class RemoteAppPermissionViewSet(OrgModelViewSet):
+    model = RemoteAppPermission
     filter_fields = ('name', )
     search_fields = filter_fields
-    queryset = RemoteAppPermission.objects.all()
     serializer_class = RemoteAppPermissionSerializer
     permission_classes = (IsOrgAdmin,)
 
 
 class RemoteAppPermissionAddUserApi(generics.RetrieveUpdateAPIView):
+    model = RemoteAppPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = RemoteAppPermissionUpdateUserSerializer
-    queryset = RemoteAppPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -46,9 +47,9 @@ class RemoteAppPermissionAddUserApi(generics.RetrieveUpdateAPIView):
 
 
 class RemoteAppPermissionRemoveUserApi(generics.RetrieveUpdateAPIView):
+    model = RemoteAppPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = RemoteAppPermissionUpdateUserSerializer
-    queryset = RemoteAppPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -63,9 +64,9 @@ class RemoteAppPermissionRemoveUserApi(generics.RetrieveUpdateAPIView):
 
 
 class RemoteAppPermissionAddRemoteAppApi(generics.RetrieveUpdateAPIView):
+    model = RemoteAppPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = RemoteAppPermissionUpdateRemoteAppSerializer
-    queryset = RemoteAppPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
@@ -80,9 +81,9 @@ class RemoteAppPermissionAddRemoteAppApi(generics.RetrieveUpdateAPIView):
 
 
 class RemoteAppPermissionRemoveRemoteAppApi(generics.RetrieveUpdateAPIView):
+    model = RemoteAppPermission
     permission_classes = (IsOrgAdmin,)
     serializer_class = RemoteAppPermissionUpdateRemoteAppSerializer
-    queryset = RemoteAppPermission.objects.all()
 
     def update(self, request, *args, **kwargs):
         perm = self.get_object()
diff --git a/apps/perms/api/user_permission/mixin.py b/apps/perms/api/user_permission/mixin.py
index 069f08937..4a004e0d1 100644
--- a/apps/perms/api/user_permission/mixin.py
+++ b/apps/perms/api/user_permission/mixin.py
@@ -34,7 +34,7 @@ class UserNodeTreeMixin:
 
         for node in nodes:
             assets_amount = self.tree.valid_assets_amount(node.key)
-            if assets_amount == 0 and node.key != Node.empty_key:
+            if assets_amount == 0 and not node.key.startswith('-'):
                 continue
             node.assets_amount = assets_amount
             data = ParserNode.parse_node_to_tree_node(node)
diff --git a/apps/perms/api/user_remote_app_permission.py b/apps/perms/api/user_remote_app_permission.py
index 030e760b5..868c92015 100644
--- a/apps/perms/api/user_remote_app_permission.py
+++ b/apps/perms/api/user_remote_app_permission.py
@@ -3,12 +3,10 @@
 import uuid
 from django.shortcuts import get_object_or_404
 from rest_framework.views import APIView, Response
-from rest_framework.generics import (
-    ListAPIView, get_object_or_404,
-)
 
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser
 from common.tree import TreeNodeSerializer
+from orgs.mixins import generics
 from ..utils import (
     RemoteAppPermissionUtil, construct_remote_apps_tree_root,
     parse_remote_app_to_tree_node,
@@ -25,7 +23,7 @@ __all__ = [
 ]
 
 
-class UserGrantedRemoteAppsApi(ListAPIView):
+class UserGrantedRemoteAppsApi(generics.ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = RemoteAppSerializer
     filter_fields = ['name', 'id']
@@ -68,7 +66,7 @@ class UserGrantedRemoteAppsAsTreeApi(UserGrantedRemoteAppsApi):
         return super().get_serializer(data, many=True)
 
 
-class UserGrantedRemoteAppSystemUsersApi(UserPermissionMixin, ListAPIView):
+class UserGrantedRemoteAppSystemUsersApi(UserPermissionMixin, generics.ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.RemoteAppSystemUserSerializer
     only_fields = serializers.RemoteAppSystemUserSerializer.Meta.only_fields
@@ -110,7 +108,7 @@ class ValidateUserRemoteAppPermissionApi(APIView):
 
 # RemoteApp permission
 
-class UserGroupGrantedRemoteAppsApi(ListAPIView):
+class UserGroupGrantedRemoteAppsApi(generics.ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser, )
     serializer_class = RemoteAppSerializer
 
diff --git a/apps/perms/hands.py b/apps/perms/hands.py
index aef0f4875..ab9e3f494 100644
--- a/apps/perms/hands.py
+++ b/apps/perms/hands.py
@@ -2,10 +2,15 @@
 #
 
 from users.models import User, UserGroup
-from assets.models import Asset, SystemUser, Node, Label
+from assets.models import Asset, SystemUser, Node, Label, FavoriteAsset
 from assets.serializers import NodeSerializer
 from applications.serializers import RemoteAppSerializer
 from applications.models import RemoteApp
 
-
+__all__ = [
+    'User', 'UserGroup',
+    'Asset', 'SystemUser', 'Node', 'Label', 'FavoriteAsset',
+    'NodeSerializer', 'RemoteAppSerializer',
+    'RemoteApp'
+]
 
diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py
index bbc64bfa9..6754511d0 100644
--- a/apps/perms/utils/asset_permission.py
+++ b/apps/perms/utils/asset_permission.py
@@ -13,7 +13,7 @@ from common.utils import get_logger, timeit, lazyproperty
 from common.tree import TreeNode
 from assets.utils import TreeService
 from ..models import AssetPermission
-from ..hands import Node, Asset, SystemUser
+from ..hands import Node, Asset, SystemUser, User, FavoriteAsset
 
 logger = get_logger(__file__)
 
@@ -293,6 +293,20 @@ class AssetPermissionUtilV2(AssetPermissionUtilCacheMixin):
                 parent=user_tree.root,
             )
 
+    def add_favorite_node_if_need(self, user_tree):
+        if not isinstance(self.object, User):
+            return
+        node_key = Node.favorite_key
+        node_value = Node.favorite_value
+        user_tree.create_node(
+            identifier=node_key, tag=node_value,
+            parent=user_tree.root,
+        )
+        assets_id = FavoriteAsset.get_user_favorite_assets_id(self.object)
+        all_valid_assets = user_tree.all_valid_assets(user_tree.root)
+        valid_assets_id = set(assets_id) & all_valid_assets
+        user_tree.set_assets(node_key, valid_assets_id)
+
     def set_user_tree_to_local(self, user_tree):
         self._user_tree = user_tree
         self._user_tree_filter_id = self._filter_id
@@ -323,6 +337,7 @@ class AssetPermissionUtilV2(AssetPermissionUtilCacheMixin):
         self.add_single_assets_node_to_user_tree(user_tree)
         self.parse_user_tree_to_full_tree(user_tree)
         self.add_empty_node_if_need(user_tree)
+        self.add_favorite_node_if_need(user_tree)
         self.set_user_tree_to_cache_if_need(user_tree)
         self.set_user_tree_to_local(user_tree)
         return user_tree
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index d028743be..4f55cfb4f 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -267,7 +267,7 @@ function requestApi(props) {
     $.ajax({
         url: props.url,
         type: props.method || "PATCH",
-        data: props.body,
+        data: props.body || props.data,
         contentType: props.content_type || "application/json; charset=utf-8",
         dataType: props.data_type || "json"
     }).done(function (data, textStatue, jqXHR) {
@@ -579,6 +579,9 @@ jumpserver.initServerSideDataTable = function (options) {
         ajax: {
             url: options.ajax_url,
             error: function (jqXHR, textStatus, errorThrown) {
+                if (jqXHR.responseText && jqXHR.responseText.indexOf("%(value)s") !== -1 ) {
+                    return
+                }
                 var msg = gettext("Unknown error occur");
                 if (jqXHR.responseJSON) {
                     if (jqXHR.responseJSON.error) {
@@ -953,8 +956,13 @@ function initPopover($container, $progress, $idPassword, $el, password_check_rul
 function rootNodeAddDom(ztree, callback) {
     var refreshIcon = "<a id='tree-refresh'><i class='fa fa-refresh'></i></a>";
     var rootNode = ztree.getNodes()[0];
-    var $rootNodeRef = $("#" + rootNode.tId + "_a");
-    $rootNodeRef.after(refreshIcon);
+    if (rootNode) {
+        var $rootNodeRef = $("#" + rootNode.tId + "_a");
+        $rootNodeRef.after(refreshIcon);
+    } else {
+        $rootNodeRef = $('#' + ztree.setting.treeId);
+        $rootNodeRef.html(refreshIcon);
+    }
     var refreshIconRef = $('#tree-refresh');
     refreshIconRef.bind('click', function () {
         ztree.destroy();
diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py
index 7071ddd33..264502959 100644
--- a/apps/terminal/api/session.py
+++ b/apps/terminal/api/session.py
@@ -24,10 +24,10 @@ logger = get_logger(__name__)
 
 
 class SessionViewSet(OrgBulkModelViewSet):
-    queryset = Session.objects.all()
+    model = Session
     serializer_class = serializers.SessionSerializer
     permission_classes = (IsOrgAdminOrAppUser, )
-    filter_fields = [
+    filterset_fields = [
         "user", "asset", "system_user", "remote_addr",
         "protocol", "terminal", "is_finished",
     ]
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index d23d9be02..1393bd241 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -72,6 +72,7 @@
         <li><a class="search-item" data-value="asset">{% trans 'Asset' %}</a></li>
         <li><a class="search-item" data-value="system_user">{% trans 'System user' %}</a></li>
         <li><a class="search-item" data-value="remote_addr">{% trans 'Remote addr' %}</a></li>
+        <li><a class="search-item" data-value="protocol">{% trans 'Protocol' %}</a></li>
 {#        <li><a class="search-item" data-value="protocol">{% trans 'Protocol' %}</a></li>#}
     </ul>
 {% endblock %}
diff --git a/apps/users/api/group.py b/apps/users/api/group.py
index e5c68004b..eb00ea220 100644
--- a/apps/users/api/group.py
+++ b/apps/users/api/group.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 #
 
-from rest_framework import generics
-
 from ..serializers import (
     UserGroupSerializer,
     UserGroupListSerializer,
@@ -10,6 +8,7 @@ from ..serializers import (
 )
 from ..models import UserGroup
 from orgs.mixins.api import OrgBulkModelViewSet
+from orgs.mixins import generics
 from common.permissions import IsOrgAdmin
 
 
@@ -17,9 +16,9 @@ __all__ = ['UserGroupViewSet', 'UserGroupUpdateUserApi']
 
 
 class UserGroupViewSet(OrgBulkModelViewSet):
+    model = UserGroup
     filter_fields = ("name",)
     search_fields = filter_fields
-    queryset = UserGroup.objects.all()
     serializer_class = UserGroupSerializer
     permission_classes = (IsOrgAdmin,)
 
@@ -31,6 +30,6 @@ class UserGroupViewSet(OrgBulkModelViewSet):
 
 
 class UserGroupUpdateUserApi(generics.RetrieveUpdateAPIView):
-    queryset = UserGroup.objects.all()
+    model = UserGroup
     serializer_class = UserGroupUpdateMemberSerializer
     permission_classes = (IsOrgAdmin,)
diff --git a/apps/users/api/user.py b/apps/users/api/user.py
index 77406c896..2a033915c 100644
--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -17,7 +17,7 @@ from common.permissions import (
 from common.mixins import CommonApiMixin
 from common.utils import get_logger
 from orgs.utils import current_org
-from .. import serializers
+from .. import serializers, utils
 from ..models import User
 from ..signals import post_user_create
 
@@ -30,13 +30,21 @@ __all__ = [
 ]
 
 
-class UserViewSet(CommonApiMixin, BulkModelViewSet):
+class UserQuerysetMixin:
+    def get_queryset(self):
+        queryset = utils.get_current_org_members()
+        return queryset
+
+
+class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet):
     filter_fields = ('username', 'email', 'name', 'id')
     search_fields = filter_fields
-    queryset = User.objects.exclude(role=User.ROLE_APP)
     serializer_class = serializers.UserSerializer
     permission_classes = (IsOrgAdmin, CanUpdateDeleteUser)
 
+    def get_queryset(self):
+        return super().get_queryset().prefetch_related('groups')
+
     def send_created_signal(self, users):
         if not isinstance(users, list):
             users = [users]
@@ -51,11 +59,6 @@ class UserViewSet(CommonApiMixin, BulkModelViewSet):
             current_org.users.add(*users)
         self.send_created_signal(users)
 
-    def get_queryset(self):
-        queryset = current_org.get_org_members()\
-            .prefetch_related('groups')
-        return queryset
-
     def get_permissions(self):
         if self.action in ["retrieve", "list"]:
             self.permission_classes = (IsOrgAdminOrAppUser,)
@@ -79,9 +82,8 @@ class UserViewSet(CommonApiMixin, BulkModelViewSet):
         return super().perform_bulk_update(serializer)
 
 
-class UserChangePasswordApi(generics.RetrieveUpdateAPIView):
+class UserChangePasswordApi(UserQuerysetMixin, generics.RetrieveUpdateAPIView):
     permission_classes = (IsOrgAdmin,)
-    queryset = User.objects.all()
     serializer_class = serializers.ChangeUserPasswordSerializer
 
     def perform_update(self, serializer):
@@ -90,13 +92,12 @@ class UserChangePasswordApi(generics.RetrieveUpdateAPIView):
         user.save()
 
 
-class UserUpdateGroupApi(generics.RetrieveUpdateAPIView):
-    queryset = User.objects.all()
+class UserUpdateGroupApi(UserQuerysetMixin, generics.RetrieveUpdateAPIView):
     serializer_class = serializers.UserUpdateGroupSerializer
     permission_classes = (IsOrgAdmin,)
 
 
-class UserResetPasswordApi(generics.UpdateAPIView):
+class UserResetPasswordApi(UserQuerysetMixin, generics.UpdateAPIView):
     queryset = User.objects.all()
     serializer_class = serializers.UserSerializer
     permission_classes = (IsAuthenticated,)
@@ -111,8 +112,7 @@ class UserResetPasswordApi(generics.UpdateAPIView):
         send_reset_password_mail(user)
 
 
-class UserResetPKApi(generics.UpdateAPIView):
-    queryset = User.objects.all()
+class UserResetPKApi(UserQuerysetMixin, generics.UpdateAPIView):
     serializer_class = serializers.UserSerializer
     permission_classes = (IsAuthenticated,)
 
@@ -125,8 +125,7 @@ class UserResetPKApi(generics.UpdateAPIView):
 
 
 # 废弃
-class UserUpdatePKApi(generics.UpdateAPIView):
-    queryset = User.objects.all()
+class UserUpdatePKApi(UserQuerysetMixin, generics.UpdateAPIView):
     serializer_class = serializers.UserPKUpdateSerializer
     permission_classes = (IsCurrentUserOrReadOnly,)
 
@@ -136,8 +135,7 @@ class UserUpdatePKApi(generics.UpdateAPIView):
         user.save()
 
 
-class UserUnblockPKApi(generics.UpdateAPIView):
-    queryset = User.objects.all()
+class UserUnblockPKApi(UserQuerysetMixin, generics.UpdateAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.UserSerializer
     key_prefix_limit = "_LOGIN_LIMIT_{}_{}"
@@ -165,8 +163,7 @@ class UserProfileApi(generics.RetrieveAPIView):
         return super().retrieve(request, *args, **kwargs)
 
 
-class UserResetOTPApi(generics.RetrieveAPIView):
-    queryset = User.objects.all()
+class UserResetOTPApi(UserQuerysetMixin, generics.RetrieveAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.ResetOTPSerializer
 
diff --git a/apps/users/forms.py b/apps/users/forms.py
index 3a8228b49..98d7c9e09 100644
--- a/apps/users/forms.py
+++ b/apps/users/forms.py
@@ -5,9 +5,8 @@ from django.utils.translation import gettext_lazy as _
 
 from common.utils import validate_ssh_public_key
 from orgs.mixins.forms import OrgModelForm
-from orgs.utils import current_org
 from .models import User, UserGroup
-from .utils import check_password_rules
+from .utils import check_password_rules, get_current_org_members
 
 
 class UserCheckPasswordForm(forms.Form):
@@ -267,15 +266,23 @@ class UserBulkUpdateForm(OrgModelForm):
     users = forms.ModelMultipleChoiceField(
         required=True,
         label=_('Select users'),
-        queryset=User.objects.all(),
+        queryset=User.objects.none(),
         widget=forms.SelectMultiple(
             attrs={
-                'class': 'select2',
+                'class': 'users-select2',
                 'data-placeholder': _('Select users')
             }
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
+
+    def set_fields_queryset(self):
+        users_field = self.fields['users']
+        users_field.queryset = get_current_org_members()
+
     class Meta:
         model = User
         fields = ['users', 'groups', 'date_expired']
@@ -320,25 +327,19 @@ class UserGroupForm(OrgModelForm):
     )
 
     def __init__(self, **kwargs):
-        instance = kwargs.get('instance')
-        if instance:
-            initial = kwargs.get('initial', {})
-            initial.update({'users': instance.users.all()})
-            kwargs['initial'] = initial
         super().__init__(**kwargs)
-        if 'initial' not in kwargs:
-            return
+        self.set_fields_queryset()
+
+    def set_fields_queryset(self):
         users_field = self.fields.get('users')
-        if instance:
-            users_field.queryset = instance.users.all()
+        if self.instance:
+            users_field.initial = self.instance.users.all()
+            users_field.queryset = self.instance.users.all()
         else:
             users_field.queryset = User.objects.none()
 
     def save(self, commit=True):
-        group = super().save(commit=commit)
-        users = self.cleaned_data['users']
-        group.users.set(users)
-        return group
+        raise Exception("Save by restful api")
 
     class Meta:
         model = UserGroup
diff --git a/apps/users/serializers/v1.py b/apps/users/serializers/v1.py
index 59890afea..847afe885 100644
--- a/apps/users/serializers/v1.py
+++ b/apps/users/serializers/v1.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 #
-import copy
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework import serializers
@@ -12,6 +11,7 @@ from common.serializers import AdaptedBulkListSerializer
 from common.permissions import CanUpdateDeleteUser
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from ..models import User, UserGroup
+from .. import utils
 
 
 __all__ = [
@@ -118,7 +118,9 @@ class UserPKUpdateSerializer(serializers.ModelSerializer):
 
 
 class UserUpdateGroupSerializer(serializers.ModelSerializer):
-    groups = serializers.PrimaryKeyRelatedField(many=True, queryset=UserGroup.objects.all())
+    groups = serializers.PrimaryKeyRelatedField(
+        many=True, queryset=UserGroup.objects
+    )
 
     class Meta:
         model = User
@@ -127,7 +129,7 @@ class UserUpdateGroupSerializer(serializers.ModelSerializer):
 
 class UserGroupSerializer(BulkOrgResourceModelSerializer):
     users = serializers.PrimaryKeyRelatedField(
-        required=False, many=True, queryset=User.objects.all(), label=_('User')
+        required=False, many=True, queryset=User.objects, label=_('User')
     )
 
     class Meta:
@@ -141,6 +143,14 @@ class UserGroupSerializer(BulkOrgResourceModelSerializer):
             'created_by': {'label': _('Created by'), 'read_only': True}
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
+
+    def set_fields_queryset(self):
+        users_field = self.fields['users']
+        users_field.child_relation.queryset = utils.get_current_org_members()
+
     def validate_users(self, users):
         for user in users:
             if user.is_super_auditor:
@@ -154,12 +164,20 @@ class UserGroupListSerializer(UserGroupSerializer):
 
 
 class UserGroupUpdateMemberSerializer(serializers.ModelSerializer):
-    users = serializers.PrimaryKeyRelatedField(many=True, queryset=User.objects.all())
+    users = serializers.PrimaryKeyRelatedField(many=True, queryset=User.objects)
 
     class Meta:
         model = UserGroup
         fields = ['id', 'users']
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.set_fields_queryset()
+
+    def set_fields_queryset(self):
+        users_field = self.fields['users']
+        users_field.child_relation.queryset = utils.get_current_org_members()
+
 
 class ChangeUserPasswordSerializer(serializers.ModelSerializer):
 
diff --git a/apps/users/templates/users/_granted_assets.html b/apps/users/templates/users/_granted_assets.html
index 8e6401a71..ce6bf3cd4 100644
--- a/apps/users/templates/users/_granted_assets.html
+++ b/apps/users/templates/users/_granted_assets.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-lg-3" style="padding-left: 0px">
+<div class="col-lg-3" style="padding-left: 0" id="split-left">
    <div class="ibox float-e-margins">
        <div class="ibox-content mailbox-content" style="padding-top: 0">
            <div class="file-manager ">
@@ -11,7 +11,12 @@
        </div>
    </div>
 </div>
-<div class="col-lg-9 animated fadeInRight">
+<div class="col-lg-9 animated fadeInRight" id="split-right">
+    <div class="tree-toggle">
+       <div class="btn btn-sm btn-primary tree-toggle-btn" onclick="toggle()">
+           <i class="fa fa-angle-left fa-x" id="toggle-icon"></i>
+       </div>
+    </div>
     <div class="mail-box-header">
 {#        <div class="btn-group" style="float: right">#}
 {#            <button data-toggle="dropdown" class="btn btn-default btn-sm labels dropdown-toggle">{% trans 'Label' %} <span class="caret"></span></button>#}
@@ -174,6 +179,27 @@ function loadLabels() {
     }
 }
 
+var show = 0;
+
+function toggle() {
+    if (show === 0) {
+        $("#split-left").hide(500, function () {
+            $("#split-right").attr("class", "col-lg-12");
+            $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
+            show = 1;
+        });
+    } else {
+        $("#split-right").attr("class", "col-lg-9");
+        $("#toggle-icon").attr("class", "fa fa-angle-left fa-x");
+        $("#split-left").show(500);
+        show = 0;
+    }
+    setTimeout(function () {
+        $(".table").css("width", "100%");
+        {#assetTable.columns.adjust();#}
+    }, 500)
+}
+
 $(document).ready(function () {
     {#loadLabels()#}
 }).on('click', '.labels-menu li', function () {
diff --git a/apps/users/templates/users/user_bulk_update.html b/apps/users/templates/users/user_bulk_update.html
index d6862fd2d..28b0e8cb7 100644
--- a/apps/users/templates/users/user_bulk_update.html
+++ b/apps/users/templates/users/user_bulk_update.html
@@ -31,6 +31,7 @@
 <script>
     $(document).ready(function () {
         $('.select2').select2();
+        usersSelect2Init('.users-select2')
     }).on('click', '.field-tag', function() {
         changeField(this);
     }).on('click', '#change_all', function () {
diff --git a/apps/users/templates/users/user_group_granted_asset.html b/apps/users/templates/users/user_group_granted_asset.html
index 4f3269d1d..2180e6313 100644
--- a/apps/users/templates/users/user_group_granted_asset.html
+++ b/apps/users/templates/users/user_group_granted_asset.html
@@ -34,7 +34,7 @@
 {% block custom_foot_js %}
 <script>
 var assetTableUrl = "{% url 'api-perms:user-group-assets' pk=object.id %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:user-group-node-assets" pk=object.id node_id=DEFAULT_PK %}?&cache_policy=1&all=1';
+var selectUrl = '{% url "api-perms:user-group-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1&all=1';
 var treeUrl = "{% url 'api-perms:user-group-nodes-children-as-tree' pk=object.id %}?cache_policy=1";
 var systemUsersUrl = "{% url 'api-perms:user-group-asset-system-users' pk=object.id asset_id=DEFAULT_PK %}?cache_policy=1";
 var showAssetHref = true; // Need input default true
diff --git a/apps/users/utils.py b/apps/users/utils.py
index ca32edee5..59400694e 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -325,3 +325,7 @@ def construct_user_email(username, email):
             email = '{}@{}'.format(username, settings.EMAIL_SUFFIX)
     return email
 
+
+def get_current_org_members(exclude=()):
+    from orgs.utils import current_org
+    return current_org.get_org_members(exclude=exclude)

From e5250294b0c171e28db1aa3b4ca6f31f096186a4 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Fri, 18 Oct 2019 15:12:17 +0800
Subject: [PATCH 25/27] Dev export (#3355)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修复导出资产csv文件为空的问题

* [Update] 修改获取系统用户 API 只返回节点数量
---
 apps/assets/filters.py                       | 2 +-
 apps/assets/models/user.py                   | 4 ++++
 apps/assets/serializers/system_user.py       | 5 +++--
 apps/assets/templates/assets/asset_list.html | 3 ++-
 apps/common/filters.py                       | 1 -
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/assets/filters.py b/apps/assets/filters.py
index 46df36ee7..b68d9d127 100644
--- a/apps/assets/filters.py
+++ b/apps/assets/filters.py
@@ -53,7 +53,7 @@ class AssetByNodeFilterBackend(filters.BaseFilterBackend):
             return queryset
 
         if node is None:
-            return queryset.none()
+            return queryset
         query_all = self.is_query_all(request)
         if query_all:
             pattern = node.get_all_children_pattern(with_self=True)
diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
index d3447b8ba..443c32981 100644
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -120,6 +120,10 @@ class SystemUser(AssetUser):
     def __str__(self):
         return '{0.name}({0.username})'.format(self)
 
+    @property
+    def nodes_amount(self):
+        return self.nodes.all().count()
+
     @property
     def login_mode_display(self):
         return self.get_login_mode_display()
diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py
index 3194f2fb6..1340741e6 100644
--- a/apps/assets/serializers/system_user.py
+++ b/apps/assets/serializers/system_user.py
@@ -26,13 +26,14 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
         fields = [
             'id', 'name', 'username', 'password', 'public_key', 'private_key',
             'login_mode', 'login_mode_display', 'priority', 'protocol',
-            'auto_push', 'cmd_filters', 'sudo', 'shell', 'comment', 'nodes',
-            'assets_amount', 'auto_generate_key'
+            'auto_push', 'cmd_filters', 'sudo', 'shell', 'comment',
+            'assets_amount', 'nodes_amount', 'auto_generate_key'
         ]
         extra_kwargs = {
             'password': {"write_only": True},
             'public_key': {"write_only": True},
             'private_key': {"write_only": True},
+            'nodes_amount': {'label': _('Node')},
             'assets_amount': {'label': _('Asset')},
             'login_mode_display': {'label': _('Login mode display')},
             'created_by': {'read_only': True},
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index b9892790d..da0a6bd5d 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -292,7 +292,8 @@ $(document).ready(function(){
         format: 'csv',
         params: {
             search: search,
-            node_id: current_node_id || ''
+            node_id: current_node_id || '',
+            show_current_asset: getCookie('show_current_asset')
         }
     };
     APIExportData(props);
diff --git a/apps/common/filters.py b/apps/common/filters.py
index 7792ff088..81138120b 100644
--- a/apps/common/filters.py
+++ b/apps/common/filters.py
@@ -63,7 +63,6 @@ class IDSpmFilter(filters.BaseFilterBackend):
         cache_key = const.KEY_CACHE_RESOURCES_ID.format(spm)
         resources_id = cache.get(cache_key)
         if not resources_id or not isinstance(resources_id, list):
-            queryset = queryset.none()
             return queryset
         queryset = queryset.filter(id__in=resources_id)
         return queryset

From a6531fedb5a832d0a0e2b8e4a17159a04fa610f3 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Fri, 18 Oct 2019 15:23:46 +0800
Subject: [PATCH 26/27] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=20TreeNode?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/tree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/tree.py b/apps/common/tree.py
index a9da1482f..1ffe4347e 100644
--- a/apps/common/tree.py
+++ b/apps/common/tree.py
@@ -51,7 +51,7 @@ class TreeNode:
             result = True
         elif self.pId != other.pId:
             result = self.pId > other.pId
-        elif self.id.startswith('-') and not other.id.startswith('-'):
+        elif str(self.id).startswith('-') and not str(other.id).startswith('-'):
             result = False
         else:
             result = self.name > other.name

From a7ae132b2b0c312cc4ee97de675cacae3756a9c4 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Fri, 18 Oct 2019 18:06:07 +0800
Subject: [PATCH 27/27] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E8=B5=84=E4=BA=A7=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8=E5=8F=96=E6=B6=88=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/user_asset_list.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index 9d3853480..fa2c9830c 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -104,6 +104,7 @@ $(document).ready(function () {
         body: JSON.stringify({asset: assetId}),
         flash_message: false,
         success: function (data) {
+            favoriteAssets.push(assetId);
             var btn = disfavorBtnTmpl.replace("ID", assetId);
             $this.replaceWith(btn)
         }
@@ -117,6 +118,10 @@ $(document).ready(function () {
         method: "DELETE",
         flash_message: false,
         success: function (data) {
+            var index = favoriteAssets.indexOf(assetId);
+            if (index !== '-1'){
+                favoriteAssets.splice(index, 1);
+            }
             var btn = favorBtnTmpl.replace("ID", assetId);
             $this.replaceWith(btn)
         }