Merge pull request #258 from newpanjing/dev

Dev

build/lib/simpleui/templates/registration/password_change_form.html

@@ -26,9 +26,7 @@
     {% endif %}
     <div id="content-main" class="form-main">
             <div>
-                <el-alert
-                        title="{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}"
-                        type="success">
+                <el-alert title="{% trans 'Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.' %}" type="success">
                 </el-alert>
 
                 {% if form.errors %}

simpleui/__init__.py

@@ -2,4 +2,4 @@
 
 
 def get_version():
-    return '3.9.2'
+    return '4.0.2'

simpleui/apps.py

@@ -12,9 +12,10 @@ def ready(self):
             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)
+                for index, item in enumerate(settings.MIDDLEWARE):
+                    if item == 'django.middleware.clickjacking.XFrameOptionsMiddleware':
+                        settings.MIDDLEWARE.pop(index)
+
         except Exception as e:
             pass
         pass

simpleui/static/admin/simpleui-x/js/index.js

@@ -92,19 +92,7 @@
         }
         return val
     }
-    window.simple_call = function (data) {
-        var oldVersion = parseInt(__simpleui_version.replace(/\./g, ''))
-        var newVersion = parseInt(data.data.name.replace(/\./g, ''))
-        var body = data.data.body;
-        // console.log(oldVersion)
-        // console.log(newVersion)
-        if (oldVersion < newVersion) {
-            app.upgrade.isUpdate = true;
-            app.upgrade.body = body;
-            app.upgrade.version = data.data.name;
 
-        }
-    }
     new Vue({
         el: '#main',
         data: {
@@ -404,7 +392,7 @@
                 var index = item.index;
                 this.menuActive = String(index);
                 this.breadcrumbs = item.breadcrumbs;
-                if (index == '1') {
+                if (tab.index == '0') {
                     item.url = '/'
                 }
                 changeUrl(item);
@@ -584,7 +572,11 @@
             },
             report: function (url) {
                 if (!url) {
-                    url = 'https://github.com/newpanjing/simpleui/issues';
+                    if ($("html").lang) {
+                        url = 'https://simpleui.88cto.com';
+                    } else {
+                        url = 'https://github.com/newpanjing/simpleui/issues';
+                    }
                 }
                 window.open(url);
             }