From 9d1f5d318450f4ce5180816bda55dd0710c54a44 Mon Sep 17 00:00:00 2001 From: vkill Date: Tue, 11 Dec 2018 11:21:07 +0800 Subject: [PATCH 1/4] Add alpine_requirements.txt (#2139) * Add alpine_requirements.txt * Update alpine_requirements.txt --- requirements/alpine_requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 requirements/alpine_requirements.txt diff --git a/requirements/alpine_requirements.txt b/requirements/alpine_requirements.txt new file mode 100644 index 000000000..687abbee4 --- /dev/null +++ b/requirements/alpine_requirements.txt @@ -0,0 +1 @@ +tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client From 18e590effd8c8e9703ce41af8b7a0671b653f5da Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Tue, 11 Dec 2018 12:04:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=8E=88=E6=9D=83=E8=A7=84=E5=88=99=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=B5=84=E4=BA=A7=E5=AF=BC=E8=87=B4=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=B8=85=E7=A9=BA=E7=9A=84bug=20-?= =?UTF-8?q?=20select2=20(#2141)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/label_create_update.html | 2 +- apps/perms/templates/perms/asset_permission_create_update.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/assets/templates/assets/label_create_update.html b/apps/assets/templates/assets/label_create_update.html index 0ff094e69..47de64df4 100644 --- a/apps/assets/templates/assets/label_create_update.html +++ b/apps/assets/templates/assets/label_create_update.html @@ -35,7 +35,7 @@ $(document).ready(function () { }) .on('click', '#btn_asset_modal_confirm', function () { var assets = asset_table2.selected; - $('.select2').val(assets).trigger('change'); + $('#id_assets').val(assets).trigger('change'); $("#asset_list_modal").modal('hide'); }) diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html index 0b2c5b93e..0be810255 100644 --- a/apps/perms/templates/perms/asset_permission_create_update.html +++ b/apps/perms/templates/perms/asset_permission_create_update.html @@ -113,7 +113,7 @@ $(document).ready(function () { .on('click', '#btn_asset_modal_confirm', function () { var assets = asset_table2.selected; - $('.select2').val(assets).trigger('change'); + $('#id_assets').val(assets).trigger('change'); $("#asset_list_modal").modal('hide'); }); From 6a2398333197d9c90bca3f01f2c1426644ae9b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Tue, 11 Dec 2018 12:51:22 +0800 Subject: [PATCH 3/4] Command (#2142) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改节点 * [Update] 优化命令运行失败日志 --- apps/assets/models/node.py | 19 ++++++++----------- apps/ops/ansible/callback.py | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 3d5c50997..af4ffd839 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -203,17 +203,14 @@ class Node(OrgModelMixin): # 如果使用current_org 在set_current_org时会死循环 _current_org = get_current_org() with transaction.atomic(): - if _current_org.is_root(): - key = '0' - elif _current_org.is_default(): - key = '1' - else: - set_current_org(Organization.root()) - org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$') - org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1'] - key = max([int(k) for k in org_nodes_roots_keys]) - key = str(key + 1) if key != 0 else '2' - set_current_org(_current_org) + if not _current_org.is_real(): + return cls.default_node() + set_current_org(Organization.root()) + org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$') + org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1'] + key = max([int(k) for k in org_nodes_roots_keys]) + key = str(key + 1) if key != 0 else '2' + set_current_org(_current_org) root = cls.objects.create(key=key, value=_current_org.name) return root diff --git a/apps/ops/ansible/callback.py b/apps/ops/ansible/callback.py index 8583b368e..f3e60a458 100644 --- a/apps/ops/ansible/callback.py +++ b/apps/ops/ansible/callback.py @@ -1,6 +1,7 @@ # ~*~ coding: utf-8 ~*~ import datetime +import json from collections import defaultdict from ansible import constants as C @@ -163,6 +164,28 @@ class CommandResultCallback(AdHocResultCallback): self._play = play self._display.banner(msg) + def v2_runner_on_unreachable(self, result): + self.results_summary['success'] = False + self.gather_result("unreachable", result) + msg = result._result.get("msg") + if not msg: + msg = json.dumps(result._result, indent=4) + self._display.display("%s | FAILED! => \n%s" % ( + result._host.get_name(), + msg, + ), color=C.COLOR_ERROR) + + def v2_runner_on_failed(self, result, ignore_errors=False): + self.results_summary['success'] = False + self.gather_result("failed", result) + msg = result._result.get("msg") or result._result.get("module_stdout") + if not msg: + msg = json.dumps(result._result, indent=4) + self._display.display("%s | FAILED! => \n%s" % ( + result._host.get_name(), + msg, + ), color=C.COLOR_ERROR) + def _print_task_banner(self, task): pass From 9c0f00f625a220777c6b18ffc0d21aa59ddd323a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Tue, 11 Dec 2018 20:32:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=89=A7=E8=A1=8C=20(#2148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改命令执行 * Update forms.py --- .../ops/command_execution_create.html | 42 +++++++++++++------ .../perms/asset_permission_create_update.html | 12 ++++-- apps/users/forms.py | 4 ++ apps/users/models/user.py | 2 - apps/users/templates/users/_user.html | 6 ++- apps/users/views/user.py | 2 + 6 files changed, 49 insertions(+), 19 deletions(-) diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html index 7d1e49c32..9a0916153 100644 --- a/apps/ops/templates/ops/command_execution_create.html +++ b/apps/ops/templates/ops/command_execution_create.html @@ -11,6 +11,10 @@ + + + +