fix: bug on admin inline #152

agusmakmun · Apr 5, 2021 · 40cd590 · 40cd590
1 parent 37d15b2
commit 40cd590
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 18 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ about: Create a bug report
 - OS (Operating System) version:
 - Browser and browser version:
 - Django version:
-- Martor version:
+- Martor version & theme:
 
 ### Steps to reproduce
 

diff --git a/martor/__init__.py b/martor/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__VERSION__ = '1.6.0'
+__VERSION__ = '1.6.1'
 __AUTHOR__ = 'Agus Makmun (Summon Agus)'
 __AUTHOR_EMAIL__ = '[email protected]'
diff --git a/martor/static/martor/css/martor-admin.css b/martor/static/martor/css/martor-admin.css
@@ -95,3 +95,8 @@ fieldset .form-row div>label {
   padding: 0;
   font-weight: 300!important;
 }
+
+/* fix issue: #152 */
+.js-inline-admin-formset .form-row {
+  display: revert;
+}
diff --git a/martor/static/martor/css/martor-admin.min.css b/martor/static/martor/css/martor-admin.min.css
diff --git a/martor/static/martor/css/martor.bootstrap.min.css b/martor/static/martor/css/martor.bootstrap.min.css
diff --git a/martor/static/martor/css/martor.semantic.min.css b/martor/static/martor/css/martor.semantic.min.css
diff --git a/martor/static/martor/js/martor.bootstrap.js b/martor/static/martor/js/martor.bootstrap.js
@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.6.0
+ * Name         : Martor v1.6.1
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 10-Mar-2021
+ * Release date : 05-Apr-2021
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/

diff --git a/martor/static/martor/js/martor.bootstrap.min.js b/martor/static/martor/js/martor.bootstrap.min.js
diff --git a/martor/static/martor/js/martor.semantic.js b/martor/static/martor/js/martor.semantic.js
@@ -1,7 +1,7 @@
 /**
- * Name         : Martor v1.6.0
+ * Name         : Martor v1.6.1
  * Created by   : Agus Makmun (Summon Agus)
- * Release date : 10-Mar-2021
+ * Release date : 05-Apr-2021
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
  * Repository   : https://github.com/agusmakmun/django-markdown-editor
 **/

diff --git a/martor/static/martor/js/martor.semantic.min.js b/martor/static/martor/js/martor.semantic.min.js
diff --git a/martor_demo/app/admin.py b/martor_demo/app/admin.py
@@ -4,10 +4,15 @@
 from martor.widgets import AdminMartorWidget
 from martor.models import MartorField
 
-from app.models import Post
+from app.models import PostMeta, Post
+
+
+class PostMetaAdminInline(admin.TabularInline):
+    model = PostMeta
 
 
 class PostAdmin(admin.ModelAdmin):
+    inlines = [PostMetaAdminInline,]
     list_display = ['title', 'id']
     formfield_overrides = {
         MartorField: {'widget': AdminMartorWidget},

diff --git a/martor_demo/app/models.py b/martor_demo/app/models.py
@@ -6,3 +6,8 @@ class Post(models.Model):
     title = models.CharField(max_length=200)
     description = MartorField()
     wiki = MartorField(blank=True)
+
+
+class PostMeta(models.Model):
+    post = models.ForeignKey(Post, on_delete=models.CASCADE)
+    text = MartorField()