Commits

David Jean Louis committed 4c10a7b Merge

merge changes by alex_robbins

Comments (0)

Files changed (2)

admin_tools/menu/forms.py

         self.user = user
 
     def save(self, *args, **kwargs):
-        bookmark = super(BookmarkForm, self).save(*args, commit=False, **kwargs)
+        bookmark = super(BookmarkForm, self).save(commit=False, *args, **kwargs)
         bookmark.user = self.user
         bookmark.save()
         return bookmark

admin_tools/menu/templates/admin/base_site.html

 
 {% block nav-global %}
 {% if user and user.is_authenticated %}
+{% if not is_popup %}
 {% admin_tools_render_menu %}
 {% endif %}
+{% endif %}
 {% endblock %}