display deleted/archived toolbar: active/unactive mode

tracim/tracim/controllers/content.py

@@ -17,7 +17,9 @@ from tracim.controllers import TIMWorkspaceContentRestController
 from tracim.lib import CST
 from tracim.lib.base import BaseController
 from tracim.lib.base import logger
-from tracim.lib.utils import SameValueError, get_valid_header_file_name
+from tracim.lib.utils import SameValueError
+from tracim.lib.utils import get_valid_header_file_name
+from tracim.lib.utils import str_as_bool
 from tracim.lib.content import ContentApi
 from tracim.lib.helpers import convert_id_into_instances
 from tracim.lib.predicates import current_user_is_reader
@@ -763,8 +765,8 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
           * show_archived: bool: Display archived contents or hide them
             if False
         """
-        show_deleted = kwargs.get('show_deleted', False)
-        show_archived = kwargs.get('show_archived', False)
+        show_deleted = str_as_bool(kwargs.get('show_deleted', ''))
+        show_archived = str_as_bool(kwargs.get('show_archived', ''))
         folder_id = int(folder_id)
         user = tmpl_context.current_user
         workspace = tmpl_context.workspace

tracim/tracim/controllers/workspace.py

@@ -50,8 +50,8 @@ class UserWorkspaceRestController(TIMRestController):
           * show_archived: bool: Display archived contents or hide them
             if False
         """
-        show_deleted = kwargs.get('show_deleted', False)
-        show_archived = kwargs.get('show_archived', False)
+        show_deleted = str_as_bool(kwargs.get('show_deleted', False))
+        show_archived = str_as_bool(kwargs.get('show_archived', ''))
         user = tmpl_context.current_user
 
         current_user_content = Context(CTX.CURRENT_USER).toDict(user)

tracim/tracim/lib/utils.py

@@ -139,3 +139,9 @@ def get_valid_header_file_name(file_name: str) -> str:
         if len(split_file_name) > 1:  # If > 1 so file have extension
             return 'download.{0}'.format(split_file_name[-1])
         return 'download'
+
+
+def str_as_bool(string: str) -> bool:
+    if string == '0':
+        return False
+    return bool(string)

tracim/tracim/templates/widgets/ui.mak

@@ -3,27 +3,24 @@
 <%def name="GENERIC_DISPLAY_VIEW_BUTTONS_CONTAINER(base_url)">
     <div class="btn-group" role="group" aria-label="...">
         ${BUTTON.TEXT('', 'btn btn-default disabled', _('display...'))}
-        <a href="${base_url}"
-           class="btn btn-default disabled-has-priority ${'t-inactive-color' if show_deleted or show_archived else ''}"
-        >
-            ${_('normal view')}
-        </a>
+
+        <% show_deleted_param = 1 %>
+        <% show_archived_param = 1 %>
 
         % if show_deleted:
-        <a href="${base_url}"
-           % else:
-        <a href="${base_url}?show_deleted=1"
-           % endif
+            <% show_deleted_param = 0 %>
+        % endif
+        % if show_archived:
+            <% show_archived_param = 0 %>
+        % endif
+
+        <a href="${base_url}?show_deleted=${show_deleted_param}&show_archived=${show_archived if show_archived else 0}"
            class="btn btn-default disabled-has-priority ${'t-inactive-color' if not show_deleted else ''}"
         >
             ${_('deleted')}
         </a>
 
-        % if show_archived:
-        <a href="${base_url}"
-           % else:
-        <a href="${base_url}?show_archived=1"
-           % endif
+        <a href="${base_url}?show_deleted=${show_deleted if show_deleted else 0}&show_archived=${show_archived_param}"
            class="btn btn-default disabled-has-priority ${'t-inactive-color' if not show_archived else ''}"
         >
             ${_('archived')}