models: use 'inbox-message' url endpoint in Document.url()

fixes #4249

docbow_project/docbow/models.py

@@ -390,7 +390,7 @@ class Document(Model):
 
     def url(self):
         return urlparse.urljoin(app_settings.BASE_URL,
-                reverse('inbox', kwargs=dict(mailbox_id=self.id)))
+                reverse('inbox-message', kwargs=dict(mailbox_id=self.id)))
 
 
 class DeletedMailbox(Model):

docbow_project/docbow/sql.py

@@ -24,7 +24,6 @@ def get_sql_ids(sql, params):
 
 def get_complex_join(qs, sql, params):
     ids = list(get_sql_ids(sql, params))
-    print 'ids', ids
     return qs.filter(pk__in=ids)
 
 def get_unseen_documents_count(related_users, user):

docbow_project/docbow/templates/base.html

@@ -5,7 +5,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>{% trans "site_title" %} — {% block title %}{% endblock %}</title>
     {% block jquery_script %}
-    <script src="{{ STATIC_URL }}jquery/js/jquery-1.6.2.min.js" type="text/javascript"></script>
+    <script>//<![CDATA[
+if(!window.jQuery) document.write('<scr'+'ipt src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></scr'+'ipt>');
+//]]></script>
     {% endblock %}
     {% block extra_scripts %}
     {% endblock %}

docbow_project/docbow/views.py

@@ -188,6 +188,7 @@ def send_file(request, file_type_id):
                         recipients_count=recipients_count)
                 return redirect('outbox')
         except Exception:
+            raise
             import logging
 
             logging.getLogger(__name__).exception('unable to create a new document')

docbow_project/settings.py

@@ -265,7 +265,6 @@ else:
         "email": "mail"
     }
 
-DEBUG_TOOLBAR_CONFIG = {}
 
 try:
     from local_settings import *
@@ -293,10 +292,7 @@ if DEBUG and 'SECRET_KEY' not in globals():
 if USE_DEBUG_TOOLBAR:
     try:
         import debug_toolbar
-        MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
         INSTALLED_APPS += ('debug_toolbar',)
-        if 'INTERCEPT_REDIRECTS' not in DEBUG_TOOLBAR_CONFIG:
-            DEBUG_TOOLBAR_CONFIG.update({ 'INTERCEPT_REDIRECTS': False })
     except ImportError:
         print "Debug toolbar missing, not loaded"