diff --git a/apps/assets/templates/assets/_asset_import_modal.html b/apps/assets/templates/assets/_asset_import_modal.html index 72d13f7a8..d226ace94 100644 --- a/apps/assets/templates/assets/_asset_import_modal.html +++ b/apps/assets/templates/assets/_asset_import_modal.html @@ -3,7 +3,6 @@ {% block modal_id %}asset_import_modal{% endblock %} {% block modal_title%}{% trans "Import asset" %}{% endblock %} {% block modal_body %} -

{% trans "Download template or use export excel format" %}

{% csrf_token %}
diff --git a/apps/assets/templates/assets/asset_group_create.html b/apps/assets/templates/assets/asset_group_create.html index 41f0d3e2f..58dab37ce 100644 --- a/apps/assets/templates/assets/asset_group_create.html +++ b/apps/assets/templates/assets/asset_group_create.html @@ -1,7 +1,8 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load bootstrap %} +{% load bootstrap3 %} +{#{% load bootstrap %}#} {% block custom_head_css_js %} @@ -34,13 +35,15 @@ {% csrf_token %}

资产组信息

- {{ form.name|bootstrap_horizontal }} - {{ form.comment|bootstrap_horizontal }} + {% bootstrap_field form.name layout="horizontal" %} + {% bootstrap_field form.comment layout="horizontal" %} +{# {{ form.name|bootstrap_horizontal }}#} +{# {{ form.comment|bootstrap_horizontal }}#}

用户选择的资产

- -
+ +

{% for asset in assets_on_list %} diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index 0514ca467..3844e2fd8 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -209,7 +209,7 @@ class AssetExportView(View): @staticmethod def get_asset_attr(asset, attr): if attr in ['admin_user', 'idc']: - return getattr(asset, attr).name + return getattr(asset, attr) elif attr in ['status', 'type', 'env']: return getattr(asset, 'get_{}_display'.format(attr))() else: @@ -225,7 +225,7 @@ class AssetExportView(View): wb = Workbook() ws = wb.active ws.title = 'Asset' - header = ['hostname', 'ip', 'port', 'admin_user', 'idc', 'cpu', 'memory', 'disk', + header = ['hostname', 'ip', 'port', 'admin_user', 'idc', 'memory', 'disk', 'mac_address', 'other_ip', 'remote_card_ip', 'os', 'cabinet_no', 'cabinet_pos', 'number', 'status', 'type', 'env', 'sn', 'comment'] ws.append(header) diff --git a/apps/common/mixins.py b/apps/common/mixins.py index 6a69221c5..f32bbd68b 100644 --- a/apps/common/mixins.py +++ b/apps/common/mixins.py @@ -47,7 +47,6 @@ class JSONResponseMixin(object): class IDInFilterMixin(object): - def filter_queryset(self, queryset): id_list = self.request.query_params.get('id__in') if id_list: @@ -55,7 +54,6 @@ class IDInFilterMixin(object): try: ids = json.loads(id_list) except Exception as e: - print e return queryset if isinstance(ids, list): queryset = queryset.filter(id__in=ids) diff --git a/apps/common/utils.py b/apps/common/utils.py index 505d129d0..41de9bada 100644 --- a/apps/common/utils.py +++ b/apps/common/utils.py @@ -26,9 +26,9 @@ from django.conf import settings from django.utils import timezone try: - import cStringIO as StringIO + from io import StringIO except ImportError: - import StringIO + from StringIO import StringIO from .compat import to_bytes, to_string @@ -183,7 +183,7 @@ def timesince(dt, since='', default="just now"): def ssh_key_string_to_obj(text): - key_f = StringIO.StringIO(text) + key_f = StringIO(text) key = None try: key = paramiko.RSAKey.from_private_key(key_f) @@ -223,7 +223,7 @@ def ssh_key_gen(length=2048, type='rsa', password=None, username='jumpserver', h if hostname is None: hostname = os.uname()[1] - f = StringIO.StringIO() + f = StringIO() try: if type == 'rsa': diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index e9d3f7e08..fa2929118 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -60,6 +60,7 @@ INSTALLED_APPS = [ 'applications.apps.ApplicationsConfig', 'rest_framework', 'bootstrapform', + 'bootstrap3', 'captcha', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/apps/ops/ansible/runner.py b/apps/ops/ansible/runner.py index 6496c4202..e82c47d73 100644 --- a/apps/ops/ansible/runner.py +++ b/apps/ops/ansible/runner.py @@ -26,10 +26,6 @@ C.HOST_KEY_CHECKING = False logger = get_logger(__name__) -class AnsibleError(StandardError): - pass - - # Jumpserver not use playbook class PlayBookRunner(object): """ diff --git a/apps/users/utils.py b/apps/users/utils.py index 1b242690e..133929c3b 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -17,10 +17,10 @@ from common.utils import reverse, get_object_or_none from .models import User -try: - import cStringIO as StringIO -except ImportError: - import StringIO +# try: +# from io import StringIO +# except ImportError: +# from StringIO import StringIO logger = logging.getLogger('jumpserver') diff --git a/apps/users/views/user.py b/apps/users/views/user.py index abe78c403..8e0d881e9 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -171,7 +171,6 @@ class UserBulkImportView(AdminUserRequiredMixin, JSONResponseMixin, FormView): try: error = form.errors.values()[-1][-1] except Exception as e: - print e error = _('Invalid file.') data = { 'success': False, diff --git a/requirements/mac_requirements.py b/requirements/mac_requirements.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/requirements/mac_requirements.txt b/requirements/mac_requirements.txt new file mode 100644 index 000000000..8d00d7608 --- /dev/null +++ b/requirements/mac_requirements.txt @@ -0,0 +1 @@ +openssl brew install libtiff libjpeg webp little-cms2 diff --git a/run_server.py b/run_server.py index 2af0a20ca..1e9bed6a3 100644 --- a/run_server.py +++ b/run_server.py @@ -23,7 +23,7 @@ def start_django(): http_port = CONFIG.HTTP_LISTEN_PORT or '8080' os.chdir(apps_dir) print('start django') - subprocess.call('python2.7 ./manage.py runserver %s:%s' % (http_host, http_port), shell=True) + subprocess.call('python ./manage.py runserver %s:%s' % (http_host, http_port), shell=True) def start_celery():