Merge remote-tracking branch 'origin/master' into feature/merge_master

2017-02-13 21:00:56 -04:00
parent b58fa7e241 cd910e8ae9
commit ce6f59b9bd
53 changed files with 3665 additions and 268 deletions
--- a/mayan/apps/linking/views.py
+++ b/mayan/apps/linking/views.py
@@ -160,9 +160,7 @@ class DocumentSmartLinkListView(SmartLinkListView):
        }

    def get_smart_link_queryset(self):
-        return ResolvedSmartLink.objects.filter(
-            document_types=self.document.document_type, enabled=True
-        )
+        return ResolvedSmartLink.objects.get_for(document=self.document)


 class SmartLinkCreateView(SingleObjectCreateView):