Enhance code lisibility for Button 'mark everything as read'

tracim/tracim/controllers/read.py

@@ -6,7 +6,7 @@ from tracim.lib.content import ContentApi
 from tracim.model.data import ContentType
 
 
-class ReadController(StandardController):
+class ContentController(StandardController):
 
     @classmethod
     def current_item_id_key_in_context(cls) -> str:
@@ -18,13 +18,10 @@ class ReadController(StandardController):
 
     @require(predicates.not_anonymous())
     @tg.expose()
-    def all(self):
-        print("read all")
+    def mark_all_read(self):
         user = tg.tmpl_context.current_user
         content_api = ContentApi(user)
-        itemset = content_api.get_last_unread(None, ContentType.Any, None)
-        for item in itemset:
-            content_api.mark_read(item)
+        content_api.mark_read__all()
 
         tg.redirect("/home")
 

tracim/tracim/controllers/root.py

@@ -12,7 +12,7 @@ from tg import url
 
 from tg.i18n import ugettext as _
 from tracim.controllers.api import APIController
-from tracim.controllers.tools import ToolsController
+from tracim.controllers.read import ContentController
 
 from tracim.lib import CST
 from tracim.lib.base import logger
@@ -63,7 +63,7 @@ class RootController(StandardController):
     workspaces = UserWorkspaceRestController()
     user = UserRestController()
 
-    tools = ToolsController()
+    content = ContentController()
 
     # api
     api = APIController()

tracim/tracim/lib/content.py

@@ -872,6 +872,17 @@ class ContentApi(object):
         content.is_deleted = False
         content.revision_type = ActionDescription.UNDELETION
 
+    def mark_read__all(self,
+                  read_datetime: datetime=None,
+                  do_flush: bool=True, recursive: bool=True):
+
+        if not read_datetime:
+            read_datetime = datetime.datetime.now()
+
+        itemset = self.get_last_unread(None, ContentType.Any, None)
+        for item in itemset:
+            self.mark_read(item, read_datetime, do_flush, recursive)
+
     def mark_read(self, content: Content,
                   read_datetime: datetime=None,
                   do_flush: bool=True, recursive: bool=True) -> Content:

tracim/tracim/templates/home.mak

@@ -96,7 +96,7 @@
                 % if fake_api.last_unread.nb <= 0:
                     ${P.EMPTY_CONTENT(_('No new content.'))}
                 % else:
-                    <a href="/tools/read/all" class="btn btn-default"> Mark everything as read </a>
+                    <a href="${tg.url('/content/mark_all_read')}" class="btn btn-default"> ${_('Mark everything as read')} </a>
                     <table class="table table-hover">
                         % for item in fake_api.last_unread.contents:
                             <tr>