Fixed DetachedInstanceError when adding a forum #127

flaskbb/management/forms.py

@@ -45,7 +45,7 @@ def selectable_categories():
     return Category.query.order_by(Category.position)
 
 def selectable_groups():
-    return Group.query.order_by(Group.name.asc()).all()
+    return Group.query.order_by(Group.id.asc()).all()
 
 def select_primary_group():
     return Group.query.filter(Group.guest != True).order_by(Group.id)
@@ -380,16 +380,12 @@ class ForumForm(Form):
         else:
             field.data = []
 
-    def save(self, obj=None):
-
+    def save(self):
         data = self.data
         # remove the button
         data.pop('submit', None)
         forum = Forum(**data)
-        # flush SQLA info from created instabce so that it can be merged
-        make_transient(forum)
-        make_transient_to_detached(forum)
-
+        # flush SQLA info from created instance so that it can be merged
         return forum.save()
 
 
@@ -402,6 +398,17 @@ class EditForumForm(ForumForm):
         kwargs['obj'] = self.forum
         ForumForm.__init__(self, *args, **kwargs)
 
+    def save(self):
+        data = self.data
+        # remove the button
+        data.pop('submit', None)
+        forum = Forum(**data)
+        # flush SQLA info from created instance so that it can be merged
+        make_transient(forum)
+        make_transient_to_detached(forum)
+
+        return forum.save()
+
 
 class AddForumForm(ForumForm):
     pass

flaskbb/management/views.py

@@ -404,6 +404,7 @@ def add_forum(category_id=None):
         flash(_("Forum successfully added."), "success")
         return redirect(url_for("management.forums"))
     else:
+        form.groups.data = Group.query.order_by(Group.id.asc()).all()
         if category_id:
             category = Category.query.filter_by(id=category_id).first()
             form.category.data = category

flaskbb/templates/management/forum_form.html

@@ -3,7 +3,7 @@
 
 {% extends theme("management/management_layout.html") %}
 {% block management_content %}
-{% from theme("macros.html") import horizontal_field, render_boolean_field, navlink, tablink_href  with context %}
+{% from theme("macros.html") import horizontal_field, render_boolean_field, navlink  with context %}
 
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
@@ -15,43 +15,34 @@
 
 
 <div class="col-md-9" role="tabpanel">
-            <form class="form-horizontal" role="form" method="post">
-    <ul class="nav nav-tabs nav-justified">
-        {{ tablink_href('#basic', _('General Settings'), true) }}
-        {{ tablink_href('#perms', _('Group Access'))}}
-    </ul>
-    <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="basic">
-                {{ form.hidden_tag() }}
-                <legend class="">{{ title }}</legend>
-                    {{ form.id }}
-                    {{ horizontal_field(form.title) }}
-                    {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
-
-                    {{ horizontal_field(form.category) }}
-                    {{ horizontal_field(form.position) }}
+    <form class="form-horizontal" role="form" method="post">
+        {{ form.hidden_tag() }}
+        <legend class="">{{ title }}</legend>
+        {{ form.id }}
+        {{ horizontal_field(form.title) }}
+        {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
 
-                    {{ horizontal_field(form.external) }}
+        {{ horizontal_field(form.category) }}
+        {{ horizontal_field(form.position) }}
 
-                    {{ horizontal_field(form.moderators) }}
-                    {{ render_boolean_field(form.show_moderators) }}
+        {{ horizontal_field(form.external) }}
 
-                    {{ render_boolean_field(form.locked) }}
+        {{ horizontal_field(form.moderators) }}
+        {{ render_boolean_field(form.show_moderators) }}
 
-                    {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
+        {{ render_boolean_field(form.locked) }}
 
-        </div>
 
-        <div role="tabpanel" class="tab-pane" id="perms">
-            <legend class="">{{ _("Group access to the forum") }}</legend>
+        <div id="perms">
+            <h4>{{ _("Group Access to the forum") }}</h4>
             {{ form.groups }}
-            {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
         </div>
 
-    </div>
-        </form>
+        {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
+    </form>
 </div>
 {% endblock %}
+
 {% block scripts %}
 {{ super() }}
 <script type="application/javascript" >
@@ -60,15 +51,9 @@
             PLACEHOLDER_TEXT: "Search Groups",
             BUILD_FULL_POST: false
         };
-{#        $('#my_megalist').attr('data-provider-src', '{{ group_list|safe }}');#}
-{#        $('#my_megalist').attr('data-provider-dst', "[]");#}
-        $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-            if ($(e.target).attr('href') == '#perms' && $('#groups').attr('inited') === undefined) { // newly activated tab
-                $('#groups').megalist(options);
-                $('#groups').attr('inited', true)
-            }
-        })
 
+        $('#groups').megalist(options);
+        $('#groups').attr('inited', true);
     });
 </script>
-{% endblock %}
+{% endblock %}