Эх сурвалжийг харах

[core] Removing the History documents from the home page

Romain Rigaux 10 жил өмнө
parent
commit
a251576

+ 3 - 30
desktop/core/src/desktop/api.py

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import itertools
 import logging
 import json
 import time
@@ -37,35 +36,9 @@ LOG = logging.getLogger(__name__)
 
 def _get_docs(user):
   history_tag = DocumentTag.objects.get_history_tag(user)
-  trash_tag = DocumentTag.objects.get_trash_tag(user)
-  docs = itertools.chain(
-      Document.objects.get_docs(user)
-        .exclude(tags__in=[trash_tag])
-        .filter(tags__in=[history_tag])
-        .select_related(
-          'owner',
-          'content_type',
-        )
-        .prefetch_related(
-          'tags',
-          'documentpermission_set',
-        )
-        .defer(None)
-        .order_by('-last_modified')[:50],
-      Document.objects.get_docs(user)
-        .exclude(tags__in=[history_tag])
-        .select_related(
-          'owner',
-          'content_type',
-        )
-        .prefetch_related(
-          'tags',
-          'documentpermission_set',
-        )
-        .defer(None)
-        .order_by('-last_modified')[:100]
-  )
-  return list(docs)
+
+  return Document.objects.get_docs(user).exclude(tags__in=[history_tag]).select_related('owner', 'content_type') \
+        .prefetch_related('tags','documentpermission_set').defer(None).order_by('-last_modified')[:100]
 
 
 def massaged_tags_for_json(docs, user):

+ 0 - 2
desktop/core/src/desktop/templates/home.mako

@@ -130,8 +130,6 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
                 % endif
               </ul>
            </li>
-           <!-- ko template: { name: 'tag-template', data: history } -->
-           <!-- /ko -->
            <!-- ko template: { name: 'tag-template', data: trash } -->
            <!-- /ko -->
            <li class="nav-header tag-mine-header">