Merge pull request #197 from newpanjing/dev

fix #193 #196 #189

simpleui/__init__.py

@@ -1,2 +1,5 @@
+default_app_config = 'simpleui.apps.SimpleApp'
+
+
 def get_version():
- return '3.6'
+ return '3.7'

simpleui/apps.py

@@ -0,0 +1,20 @@
+from django.apps import AppConfig
+
+
+class SimpleApp(AppConfig):
+ name = 'simpleui'
+
+ def ready(self):
+ # 如果是django3+ 就使用中间件，删除header中的X-Frame-Options
+
+ try:
+ import django
+ version = django.get_version()
+ if int(version.split('.')[0]) >= 3:
+ from django.conf import settings
+ mname = 'simpleui.middlewares.SimpleMiddleware'
+ if mname not in settings.MIDDLEWARE:
+ settings.MIDDLEWARE.append(mname)
+ except Exception as e:
+ pass
+ pass

simpleui/middlewares.py

@@ -0,0 +1,14 @@
+import os
+
+try:
+
+ from django.utils.deprecation import MiddlewareMixin # Django 1.10.x
+except ImportError:
+ MiddlewareMixin = object # Django 1.4.x - Django 1.9.x
+
+
+class SimpleMiddleware(MiddlewareMixin):
+
+ def process_response(self, request, response):
+ response['X-Frame-Options'] = 'ALLOW-FROM'
+ return response

simpleui/templates/admin/change_form.html

@@ -19,9 +19,11 @@
 
  </style>
  <div id="content-main" class="form-main">
+ {% if '_popup' not in request.GET %}
  <div class="page-header">
  <el-page-header @back="goBack" content="{{title}}"/>
  </div>
+ {% endif %}
  {% block object-tools %}
  {% if change %}{% if not is_popup %}
  <ul class="object-tools">

simpleui/templates/admin/submit_line.html

@@ -1,9 +1,11 @@
 {% load i18n admin_urls simpletags%}
 <div class="submit-row">
- <el-button type="button" icon="el-icon-arrow-left" @click="prev()"
- style="float: left;margin-right: 10px;margin-bottom: 10px;">
- <span v-text="getLanuage('Go back')"></span>
- </el-button>
+ {% if '_popup' not in request.GET %}
+ <el-button type="button" icon="el-icon-arrow-left" @click="prev()"
+ style="float: left;margin-right: 10px;margin-bottom: 10px;">
+ <span v-text="getLanuage('Go back')"></span>
+ </el-button>
+ {% endif %}
  {% if show_delete_link %}
  {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
  <el-button icon="el-icon-delete" type="danger" @click="del('{% add_preserved_filters delete_url %}')"