Merge branch 'master' of github.com:tracim/tracim

README.md

@@ -118,7 +118,8 @@ You'll need to install the following packages :
 
     sudo apt install git realpath redis-server \
                      python3 python-virtualenv python3-dev python-pip  python-lxml \
-                     build-essential libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev
+                     build-essential libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev \
+                     libmagickwand-6.q16-3
 
 ## Get the source ##
 
@@ -159,6 +160,10 @@ Activate it in your terminal session (**all tracim command execution must be exe
 
     source tg2env/bin/activate
 
+Ensure latest `pip`/`setuptools` versions are installed:
+
+    pip install --upgrade pip setuptools
+
 Install Tracim and its dependencies:
 
     cd tracim/

install/requirements.txt

@@ -19,7 +19,7 @@ argparse==1.2.1
 backlash==0.0.7
 beautifulsoup4==4.4.0
 caldav==0.4.0
-cliff==1.8.0
+cliff==2.9.1
 cmd2==0.6.9
 coverage==4.4.1
 crank==0.7.3
@@ -30,21 +30,21 @@ itsdangerous==0.24
 ldap3==1.3.1
 lxml==3.6.0
 nose==1.3.4
-pbr==0.10.0
+pbr==3.1.1
 prettytable==0.7.2
 py4j==0.10.1
 pyasn1==0.1.9
-pyparsing==2.0.3
+pyparsing==2.1.0
 python-dateutil==2.5.3
 python-editor==1.0.1
 python-ldap-test==0.2.1
 repoze.lru==0.7
 repoze.who==2.3
 requests==2.10.0
-six==1.8.0
+six==1.9.0
 speaklater==1.3
 sprox==0.9.4
-stevedore==1.1.0
+stevedore==1.20.0
 tg.devtools==2.3.7
 tgapp-resetpassword==0.2.0
 tgext.admin==0.6.4

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

@@ -1564,7 +1564,7 @@ msgstr "Supprimer"
 #: tracim/templates/thread/toolbar.mak:53
 #: tracim/templates/thread/toolbar.mak:57
 msgid "Restore"
-msgstr ""
+msgstr "Restaurer"
 
 #: tracim/templates/folder/forms.mak:12
 msgid "New Folder"

tracim/tracim/model/serializers.py

@@ -979,6 +979,7 @@ def serialize_workspace_default(workspace: Workspace, context: Context):
         id = workspace.workspace_id,
         label = workspace.label,  # FIXME - 2015-08-20 - remove this property
         name = workspace.label,  # use name instead of label
+        is_deleted=workspace.is_deleted,
         url = context.url('/workspaces/{}'.format(workspace.workspace_id))
     )
     return result

tracim/tracim/templates/admin/user_getone.mak

@@ -75,11 +75,13 @@
                         </tr>
                     </thead>
                     % for role in result.user.roles:
+                        % if not role.workspace.is_deleted:
                         <%
                             enable_link = '/admin/users/{user}/workspaces/{workspace}/enable_notifications?next_url=/admin/users/{user}'
                             disable_link = '/admin/users/{user}/workspaces/{workspace}/disable_notifications?next_url=/admin/users/{user}'
                         %>
                         ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(fake_api.current_user, role, show_id=True, enable_link=enable_link, disable_link=disable_link)}
+                        % endif
                     % endfor
                 </table>
             % endif

tracim/tracim/tests/library/test_resetpassword.py

@@ -16,25 +16,25 @@ class TestResetPassword(TestStandard):
     # [1] no admin calendar: https://github.com/tracim/tracim/issues/274
     # Deactivating it solves this odd issue, probably due to improper
     # individual test environment setup in tests sequence.
-    def deactivated_test_unit__plain_send_mail__ok(self):
-        if sys.version_info >= (3, 5):
-            from smtplib import SMTPNotSupportedError
+    #def deactivated_test_unit__plain_send_mail__ok(self):
+    #    if sys.version_info >= (3, 5):
+    #        from smtplib import SMTPNotSupportedError
 
-            assert_raises(
-                (ConnectionRefusedError, SMTPNotSupportedError),
-                _plain_send_mail,
-                'Name of sender <email@sender.local>',
-                'Recipient name <recipient@recipient.local>',
-                'hello',
-                'How are you ?',
-            )
-        else:
-            from smtplib import SMTPException
-            assert_raises(
-                (SMTPException, ConnectionRefusedError),
-                _plain_send_mail,
-                'Name of sender <email@sender.local>',
-                'Recipient name <recipient@recipient.local>',
-                'hello',
-                'How are you ?',
-            )
+    #        assert_raises(
+    #            (ConnectionRefusedError, SMTPNotSupportedError),
+    #            _plain_send_mail,
+    #            'Name of sender <email@sender.local>',
+    #            'Recipient name <recipient@recipient.local>',
+    #            'hello',
+    #            'How are you ?',
+    #        )
+    #    else:
+    #        from smtplib import SMTPException
+    #        assert_raises(
+    #            (SMTPException, ConnectionRefusedError),
+    #            _plain_send_mail,
+    #            'Name of sender <email@sender.local>',
+    #            'Recipient name <recipient@recipient.local>',
+    #            'hello',
+    #            'How are you ?',
+    #        )