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

tracim/development.ini.base

@@ -33,12 +33,13 @@ cookie_secret = 3283411b-1904-4554-b0e1-883863b53080
 use = egg:tracim
 full_stack = true
 # You can set french as default language by uncommenting next line
-# lang = fr
+# i18n.lang = fr
 
 cache_dir = %(here)s/data
 # preview generator cache directory
 preview_cache_dir = /tmp/tracim/preview/
-# file depot storage directory
+# file depot storage
+depot_storage_name = tracim
 depot_storage_dir = %(here)s/depot/
 
 beaker.session.key = tracim

tracim/migration/versions/913efdf409e5_all_files_also_on_disk.py

@@ -8,12 +8,14 @@ Create Date: 2017-07-12 15:44:20.568447
 
 import shutil
 
+from alembic import context
 from alembic import op
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.upload import UploadedFile
 from depot.io.utils import FileIntent
 from depot.manager import DepotManager
 import sqlalchemy as sa
+from sqlalchemy.sql.expression import func
 
 # revision identifiers, used by Alembic.
 revision = '913efdf409e5'
@@ -33,6 +35,17 @@ revision_helper = sa.Table(
 )
 
 
+def configure_depot():
+    """Configure Depot."""
+    depot_storage_name = context.config.get_main_option('depot_storage_name')
+    depot_storage_path = context.config.get_main_option('depot_storage_dir')
+    depot_storage_settings = {'depot.storage_path': depot_storage_path}
+    DepotManager.configure(
+        depot_storage_name,
+        depot_storage_settings,
+    )
+
+
 def delete_files_on_disk(connection: sa.engine.Connection):
     """Deletes files from disk and their references in database."""
     delete_query = revision_helper.update() \
@@ -40,7 +53,8 @@ def delete_files_on_disk(connection: sa.engine.Connection):
         .where(revision_helper.c.depot_file.isnot(None)) \
         .values(depot_file=None)
     connection.execute(delete_query)
-    shutil.rmtree('depot/', ignore_errors=True)
+    depot_storage_path = context.config.get_main_option('depot_storage_dir')
+    shutil.rmtree(depot_storage_path, ignore_errors=True)
 
 
 def upgrade():
@@ -54,14 +68,13 @@ def upgrade():
     - create all files on disk from database.
     """
     # Creates files depot used in this migration
-    DepotManager.configure(
-        'tracim', {'depot.storage_path': 'depot/'},
-    )
+    configure_depot()
     connection = op.get_bind()
     delete_files_on_disk(connection=connection)
     select_query = revision_helper.select() \
         .where(revision_helper.c.type == 'file') \
-        .where(revision_helper.c.depot_file.is_(None))
+        .where(revision_helper.c.depot_file.is_(None)) \
+        .where(func.length(revision_helper.c.file_content) > 0)
     files = connection.execute(select_query).fetchall()
     for file in files:
         file_filename = '{0}{1}'.format(
@@ -76,8 +89,7 @@ def upgrade():
         depot_file_field = UploadedFile(depot_file_intent, 'tracim')
         update_query = revision_helper.update() \
             .where(revision_helper.c.revision_id == file.revision_id) \
-            .values(depot_file=depot_file_field) \
-            .return_defaults()
+            .values(depot_file=depot_file_field)
         connection.execute(update_query)
 
 

tracim/tracim/config/app_cfg.py

@@ -129,7 +129,7 @@ def start_daemons(manager: DaemonsManager):
 
 def configure_depot():
     """Configure Depot."""
-    depot_storage_name = 'tracim'
+    depot_storage_name = CFG.get_instance().DEPOT_STORAGE_NAME
     depot_storage_path = CFG.get_instance().DEPOT_STORAGE_DIR
     depot_storage_settings = {'depot.storage_path': depot_storage_path}
     DepotManager.configure(
@@ -219,6 +219,14 @@ class CFG(object):
                 'ERROR: depot_storage_dir configuration is mandatory. '
                 'Set it before continuing.'
             )
+        self.DEPOT_STORAGE_NAME = tg.config.get(
+            'depot_storage_name',
+        )
+        if not self.DEPOT_STORAGE_NAME:
+            raise Exception(
+                'ERROR: depot_storage_name configuration is mandatory. '
+                'Set it before continuing.'
+            )
         self.PREVIEW_CACHE_DIR = tg.config.get(
             'preview_cache_dir',
         )

tracim/tracim/controllers/admin/user.py

@@ -456,14 +456,3 @@ class UserRestController(TIMRestController):
         if next_url=='user':
             tg.redirect(self.url(id=user.user_id))
         tg.redirect(self.url())
-
-
-    @tg.require(predicates.in_group(Group.TIM_USER_GROUPNAME))
-    @tg.expose('tracim.templates.user_profile')
-    def me(self):
-        current_user = tmpl_context.current_user
-
-        current_user_content = Context(CTX.CURRENT_USER).toDict(current_user)
-        fake_api = Context(CTX.ADMIN_WORKSPACE).toDict({'current_user': current_user_content})
-
-        return DictLikeClass(fake_api=fake_api)

tracim/tracim/controllers/content.py

@@ -355,6 +355,7 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
                                  file_data.file.read())
             # Display error page to user if chosen label is in conflict
             if not self._path_validation.validate_new_content(file):
+                DBSession.rollback()
                 return render_invalid_integrity_chosen_path(
                     file.get_label_as_file(),
                 )
@@ -567,6 +568,7 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
             page.description = content
 
             if not self._path_validation.validate_new_content(page):
+                DBSession.rollback()
                 return render_invalid_integrity_chosen_path(
                     page.get_label(),
                 )
@@ -683,19 +685,19 @@ class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController)
                                 workspace,
                                 tmpl_context.folder,
                                 label)
-            # FIXME - DO NOT DUPLCIATE FIRST MESSAGE
-            # thread.description = content
-            api.save(thread, ActionDescription.CREATION, do_notify=False)
-
-            comment = api.create(ContentType.Comment, workspace, thread, label)
-            comment.label = ''
-            comment.description = content
 
             if not self._path_validation.validate_new_content(thread):
+                DBSession.rollback()
                 return render_invalid_integrity_chosen_path(
                     thread.get_label(),
                 )
 
+        # FIXME - DO NOT DUPLICATE FIRST MESSAGE
+        # thread.description = content
+        api.save(thread, ActionDescription.CREATION, do_notify=False)
+        comment = api.create(ContentType.Comment, workspace, thread, label)
+        comment.label = ''
+        comment.description = content
         api.save(comment, ActionDescription.COMMENT, do_notify=False)
         api.do_notify(thread)
 
@@ -1020,6 +1022,7 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
                 api.set_allowed_content(folder, subcontent)
 
                 if not self._path_validation.validate_new_content(folder):
+                    DBSession.rollback()
                     return render_invalid_integrity_chosen_path(
                         folder.get_label(),
                     )

tracim/tracim/lib/notifications.py

@@ -375,6 +375,18 @@ class EmailNotifier(object):
                 content_text = '<p id="content-body-intro">{}</p>'.format(content.get_label()) + \
                     content.description
 
+        elif ActionDescription.STATUS_UPDATE == action:
+            call_to_action_text = l_('View online')
+            intro_user_msg = l_(
+                '<span id="content-intro-username">{}</span> '
+                'updated the following status:'
+            )
+            content_intro = intro_user_msg.format(actor.display_name)
+            intro_body_msg = '<p id="content-body-intro">{}: {}</p>'
+            content_text = intro_body_msg.format(
+                content.get_label(),
+                content.get_status().label,
+            )
 
         if '' == content_intro and content_text == '':
             # Skip notification, but it's not normal

tracim/tracim/templates/user_profile.mak

@@ -1,70 +0,0 @@
-<%inherit file="local:templates.master_authenticated"/>
-<%namespace name="TIM" file="tracim.templates.pod"/>
-<%namespace name="TOOLBAR" file="tracim.templates.user_toolbars"/>
-<%namespace name="WIDGETS" file="tracim.templates.user_workspace_widgets"/>
-<%def name="title()">${_('My profile')}</%def>
-
-<div class="container-fluid">
-    <div class="row-fluid">
-        ${TOOLBAR.USER(fake_api.current_user, fake_api.current_user)}
-        <div>
-            <div class="row">
-                <h3 class="col-sm-11">${TIM.ICO(32, 'actions/contact-new')} ${_("User profile")}</h3>
-            </div>
-            <div class="row">
-                <div class="col-sm-4" id='user-profile-global-info'>
-                    <div class="well well-sm">
-                        <h3>
-                            ${fake_api.current_user.name}
-                        </h3>
-                        <p>
-                            ${TIM.ICO(16, 'apps/internet-mail')}
-                            <a href="mailto:${fake_api.current_user.email}">${fake_api.current_user.email}</a>
-                        </p>
-                        <p>
-                            % if fake_api.current_user.profile.id>=2:
-                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('I can create workspaces.')}</span><br/>
-                            % endif
-                            % if fake_api.current_user.profile.id>=3:
-                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('I\'m an administrator.')}</span><br/>
-                            % endif
-                        </p>
-                    </div>
-                </div>
-
-                <div class="col-sm-4" id='user-profile-global-info'>
-                    <div class="well well-sm">
-                        <h3>
-                            ${TIM.ICO(22, 'places/folder-remote')}
-                            ${_('Workspaces')}
-                        </h3>
-                        % if len(fake_api.current_user.roles)<=0:
-                            ${WIDGETS.EMPTY_CONTENT(_('This user is not member of any workspace.'))}
-                        % else:
-                            <table class="table">
-                                % for role in fake_api.current_user.roles:
-                                    <tr><td>${role.workspace.name}</td><td><span style="${role.style}">${role.label}</span></td></tr>
-                                % endfor
-                            </table>
-                        % endif
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="user-edit-modal-dialog" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-    </div>
-  </div>
-</div>
-
-<div id="user-edit-password-modal-dialog" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-    </div>
-  </div>
-</div>
-