Merge pull request #309 from newpanjing/dev

Dev
newpanjing · Sep 17, 2020 · c6a64ea · c6a64ea
2 parents a646823 + 41a0d3d
commit c6a64ea
Show file tree

Hide file tree

Showing 253 changed files with 106,261 additions and 109,980 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ Django Admin默认界面设计语言存在着的一些不足，比如色彩单
 ## QQ群
 + QQ群号:873469913
 
-<img src='https://github.com/newpanjing/simpleui/raw/master/images/QQ%E7%BE%A4.jpg' width='200'>
+<img src='https://github.com/newpanjing/simpleui/raw/master/images/QQ2.jpg' width='200'>
 
 
 ## 文档

diff --git a/doc/en/README_en.md b/doc/en/README_en.md
@@ -49,7 +49,7 @@ simpleui Characteristics
 ## QQ Group
 + QQ group : 873469913
 
-<img src='https://github.com/newpanjing/simpleui/raw/master/images/QQ%E7%BE%A4.jpg' width='200'>
+<img src='https://github.com/newpanjing/simpleui/raw/master/images/QQ2.jpg' width='200'>
 
 
 ## Document

diff --git a/images/QQ2.jpg b/images/QQ2.jpg
diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -2,4 +2,4 @@
 
 
 def get_version():
-    return '2020.8'
+    return '2020.9'
diff --git a/simpleui/static/admin/js/admin/RelatedObjectLookups.js b/simpleui/static/admin/js/admin/RelatedObjectLookups.js
@@ -94,6 +94,10 @@
             var o = new Option(newRepr, newId);
             SelectBox.add_to_cache(toId, o);
             SelectBox.redisplay(toId);
+
+            if (SelectBox.add) {
+                SelectBox.add(name, newRepr, newId)
+            }
         }
         win.close();
     }
@@ -108,6 +112,9 @@
                 this.value = newId;
             }
         });
+        if(SelectBox.change){
+            SelectBox.change(id, newRepr, newId,objId);
+        }
         selects.next().find('.select2-selection__rendered').each(function () {
             // The element can have a clear button as a child.
             // Use the lastChild to modify only the displayed value.
@@ -126,6 +133,9 @@
                 $(this).remove();
             }
         }).trigger('change');
+        if(SelectBox.remove){
+            SelectBox.remove(id,objId);
+        }
         win.close();
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def get_version():
		return '2020.8'
		return '2020.9'