Merge pull request #1 from lebouquetin/master

.gitignore

@@ -59,6 +59,6 @@ tracim/data/
 
 # Site-local config file
 development.ini
-
+track.js
 # Temporary files
 *~

tracim/tracim/controllers/content.py

@@ -642,3 +642,118 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             next_url = self.url(int(folder_id))
 
         tg.redirect(next_url)
+
+    @property
+    def _std_url(self):
+        return tg.url('/workspaces/{}/folders/{}')
+
+    @property
+    def _parent_url(self):
+        return tg.url('/workspaces/{}')
+
+    @property
+    def _item_type_label(self):
+        return _('Folder')
+
+    @property
+    def _item_type(self):
+        return ContentType.Folder
+
+
+    @tg.require(current_user_is_content_manager())
+    @tg.expose()
+    def put_archive(self, item_id):
+        # TODO - CHECK RIGHTS
+        item_id = int(item_id)
+        content_api = ContentApi(tmpl_context.current_user)
+        item = content_api.get_one(item_id, self._item_type, tmpl_context.workspace)
+
+        try:
+            next_url = self._parent_url.format(item.workspace_id, item.parent_id)
+            undo_url = self._std_url.format(item.workspace_id, item.content_id)+'/put_archive_undo'
+            msg = _('{} archived. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
+
+            content_api.archive(item)
+            content_api.save(item, ActionDescription.ARCHIVING)
+
+            tg.flash(msg, CST.STATUS_OK, no_escape=True) # TODO allow to come back
+            tg.redirect(next_url)
+        except ValueError as e:
+            next_url = self._std_url.format(item.workspace_id, item.parent_id, item.content_id)
+            msg = _('{} not archived: {}').format(self._item_type_label, str(e))
+            tg.flash(msg, CST.STATUS_ERROR)
+            tg.redirect(next_url)
+
+
+    @tg.require(current_user_is_content_manager())
+    @tg.expose()
+    def put_archive_undo(self, item_id):
+        print('AGAGA')
+        # TODO - CHECK RIGHTS
+        item_id = int(item_id)
+        content_api = ContentApi(tmpl_context.current_user, True, True) # Here we do not filter deleted items
+        item = content_api.get_one(item_id, self._item_type, tmpl_context.workspace)
+        try:
+            next_url = self._std_url.format(item.workspace_id, item.content_id)
+            msg = _('{} unarchived.').format(self._item_type_label)
+            content_api.unarchive(item)
+            content_api.save(item, ActionDescription.UNARCHIVING)
+
+            tg.flash(msg, CST.STATUS_OK)
+            tg.redirect(next_url )
+
+        except ValueError as e:
+            msg = _('{} not un-archived: {}').format(self._item_type_label, str(e))
+            next_url = self._std_url.format(item.workspace_id, item.content_id)
+            # We still use std url because the item has not been archived
+            tg.flash(msg, CST.STATUS_ERROR)
+            tg.redirect(next_url)
+
+    @tg.require(current_user_is_content_manager())
+    @tg.expose()
+    def put_delete(self, item_id):
+        # TODO - CHECK RIGHTS
+        item_id = int(item_id)
+        content_api = ContentApi(tmpl_context.current_user)
+        item = content_api.get_one(item_id, self._item_type, tmpl_context.workspace)
+        try:
+
+            next_url = self._parent_url.format(item.workspace_id, item.parent_id)
+            undo_url = self._std_url.format(item.workspace_id, item.content_id)+'/put_delete_undo'
+            msg = _('{} deleted. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
+            content_api.delete(item)
+            content_api.save(item, ActionDescription.DELETION)
+
+            tg.flash(msg, CST.STATUS_OK, no_escape=True)
+            tg.redirect(next_url)
+
+        except ValueError as e:
+            back_url = self._std_url.format(item.workspace_id, item.content_id)
+            msg = _('{} not deleted: {}').format(self._item_type_label, str(e))
+            tg.flash(msg, CST.STATUS_ERROR)
+            tg.redirect(back_url)
+
+
+    @tg.require(current_user_is_content_manager())
+    @tg.expose()
+    def put_delete_undo(self, item_id):
+        # TODO - CHECK RIGHTS
+
+        item_id = int(item_id)
+        content_api = ContentApi(tmpl_context.current_user, True, True) # Here we do not filter deleted items
+        item = content_api.get_one(item_id, self._item_type, tmpl_context.workspace)
+        try:
+            next_url = self._std_url.format(item.workspace_id, item.content_id)
+            msg = _('{} undeleted.').format(self._item_type_label)
+            content_api.undelete(item)
+            content_api.save(item, ActionDescription.UNDELETION)
+
+            tg.flash(msg, CST.STATUS_OK)
+            tg.redirect(next_url)
+
+        except ValueError as e:
+            logger.debug(self, 'Exception: {}'.format(e.__str__))
+            back_url = self._parent_url.format(item.workspace_id, item.parent_id)
+            msg = _('{} not un-deleted: {}').format(self._item_type_label, str(e))
+            tg.flash(msg, CST.STATUS_ERROR)
+            tg.redirect(back_url)

tracim/tracim/model/data.py

@@ -331,6 +331,12 @@ class Content(DeclarativeBase):
     parent = relationship('Content', remote_side=[content_id], backref='children')
     owner = relationship('User', remote_side=[User.user_id])
 
+    @property
+    def valid_children(self):
+        for child in self.children:
+            if not child.is_deleted and not child.is_archived:
+                yield child
+
     @hybrid_property
     def properties(self):
         """ return a structure decoded from json content of _properties """
@@ -365,7 +371,7 @@ class Content(DeclarativeBase):
 
     def get_child_nb(self, content_type: ContentType, content_status = ''):
         child_nb = 0
-        for child in self.children:
+        for child in self.valid_children:
             if child.type==content_type:
                 if not content_status:
                     child_nb = child_nb+1

tracim/tracim/templates/folder_toolbars.mak

@@ -16,13 +16,23 @@
         <p></p>
     % endif
     
-    <div class="btn-group btn-group-vertical">
-        % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+        <div class="btn-group btn-group-vertical">
             ## This action is allowed for content managers only
             <a title="${_('Move current folder')}" class="btn btn-default ${move_disabled}" data-toggle="modal" data-target="#folder-move-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/location/{}/edit'.format(folder.workspace.id, folder.id, folder.id))}" >${TIM.ICO(32, 'actions/item-move')}</a>
-        % endif
-    </div>
-    <p></p>
+        </div>
+        <p></p>
+    % endif
+
+    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+        ## if the user can see the toolbar, it means he is the workspace manager.
+        ## So now, we need to know if he alsa has right to delete workspaces
+        <div class="btn-group btn-group-vertical">
+            <a title="${_('Archive thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/put_archive'.format(folder.workspace.id, folder.id))}">${TIM.ICO(32, 'mimetypes/package-x-generic')}</a>
+            <a title="${_('Delete thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/put_delete'.format(folder.workspace.id, folder.id))}">${TIM.ICO(32, 'status/user-trash-full')}</a>
+        </div>
+        <p></p>
+    % endif
 
 </%def>