Merge pull request #17 from lebouquetin/master

tracim/tracim/controllers/__init__.py

@@ -23,6 +23,7 @@ from tracim.model.data import Workspace
 
 from tracim.lib.content import ContentApi
 from tracim.lib.user import UserStaticApi
+from tracim.lib.utils import SameValueError
 
 from tracim.model.serializers import Context
 from tracim.model.serializers import DictLikeClass
@@ -248,6 +249,11 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(self._std_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item.content_id))
 
+        except SameValueError as e:
+            msg = _('{} not updated: the content did not change').format(self._item_type_label)
+            tg.flash(msg, CST.STATUS_WARNING)
+            tg.redirect(self._err_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item_id))
+
         except ValueError as e:
             msg = _('{} not updated - error: {}').format(self._item_type_label, str(e))
             tg.flash(msg, CST.STATUS_ERROR)

tracim/tracim/controllers/content.py

@@ -18,6 +18,7 @@ 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
 from tracim.lib.content import ContentApi
 from tracim.lib.helpers import convert_id_into_instances
 from tracim.lib.predicates import current_user_is_reader
@@ -426,6 +427,11 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(self._std_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item.content_id))
 
+        except SameValueError as e:
+            msg = _('{} not updated: the content did not change').format(self._item_type_label)
+            tg.flash(msg, CST.STATUS_WARNING)
+            tg.redirect(self._err_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item_id))
+
         except ValueError as e:
             msg = _('{} not updated - error: {}').format(self._item_type_label, str(e))
             tg.flash(msg, CST.STATUS_ERROR)

tracim/tracim/lib/content.py

@@ -15,6 +15,7 @@ from sqlalchemy import not_
 from sqlalchemy import or_
 from tracim.lib import cmp_to_key
 from tracim.lib.notifications import NotifierFactory
+from tracim.lib.utils import SameValueError
 from tracim.model import DBSession
 from tracim.model.auth import User
 from tracim.model.data import ActionDescription
@@ -335,6 +336,8 @@ class ContentApi(object):
 
 
     def update_content(self, item: Content, new_label: str, new_content: str=None) -> Content:
+        if item.label==new_label and item.description==new_content:
+            raise SameValueError(_('The content did not changed'))
         item.owner = self._user
         item.label = new_label
         item.description = new_content if new_content else item.description # TODO: convert urls into links

tracim/tracim/lib/notifications.py

@@ -282,7 +282,7 @@ class EmailNotifier(object):
 
         action = content.get_last_action().id
         if ActionDescription.COMMENT == action:
-            content_intro = _('<span id="content-intro-username">{}</span> added a comment:'.format(actor.display_name))
+            content_intro = _('<span id="content-intro-username">{}</span> added a comment:').format(actor.display_name)
             content_text = content.description
             call_to_action_text = _('Answer')
 
@@ -332,6 +332,13 @@ class EmailNotifier(object):
 
             elif ContentType.Thread == content.type:
                 content_intro = _('<span id="content-intro-username">{}</span> updated the thread description.').format(actor.display_name)
+                previous_revision = content.get_previous_revision()
+                title_diff = ''
+                if previous_revision.label != content.label:
+                    title_diff = htmldiff(previous_revision.label, content.label)
+                content_text = _('<p id="content-body-intro">Here is an overview of the changes:</p>')+ \
+                    title_diff + \
+                    htmldiff(previous_revision.description, content.description)
 
             # elif ContentType.Thread == content.type:
             #     content_intro = _('<span id="content-intro-username">{}</span> updated this page.').format(actor.display_name)
@@ -359,18 +366,17 @@ class EmailNotifier(object):
             )
             raise ValueError('Unexpected empty notification')
 
-        # Thread - create
-        # logger.debug(self, 'This is a NOT comment <--------------------- {}'.format(content.type))
-        body_content = template.render(base_url=self._global_config.WEBSITE_BASE_URL,
-                               _=_,
-                               h=helpers,
-                               user_display_name=role.user.display_name,
-                               user_role_label=role.role_as_label(),
-                               workspace_label=role.workspace.label,
-                               content_intro=content_intro,
-                               content_text=content_text,
-                               main_title=main_title,
-                               call_to_action_text=call_to_action_text,
-                               result = DictLikeClass(item=dictified_item, actor=dictified_actor))
+        body_content = template.render(
+            base_url=self._global_config.WEBSITE_BASE_URL,
+            _=_,
+            h=helpers,
+            user_display_name=role.user.display_name,
+            user_role_label=role.role_as_label(),
+            workspace_label=role.workspace.label,
+            content_intro=content_intro,
+            content_text=content_text,
+            main_title=main_title,
+            call_to_action_text=call_to_action_text,
+            result = DictLikeClass(item=dictified_item, actor=dictified_actor))
 
         return body_content

tracim/tracim/lib/utils.py

@@ -15,3 +15,6 @@ def exec_time_monitor():
         return wrapper_func
     return decorator_func
 
+
+class SameValueError(ValueError):
+    pass

tracim/tracim/templates/mail/content_update_body_html.mak

@@ -25,7 +25,7 @@
       #content-body del { background-color: #FAA; }
 
 
-      #call-to-action-button { background-color: #5CB85C; border: 1px solid #4CAE4C; color: #FFF; text-decoration: none; font-weight: bold; padding: 4px; border-radius: 3px; font-size: 2em; padding-right: 0.5em;}
+      #call-to-action-button { background-color: #5CB85C; border: 1px solid #4CAE4C; color: #FFF; text-decoration: none; font-weight: bold; border-radius: 3px; font-size: 2em; padding: 4px 0.3em;}
       #call-to-action-container { text-align: right; margin-top: 2em; }
 
       #footer hr { border: 0px solid #CCC; border-top-width: 1px; width: 8em; max-width:25%; margin-left: 0;}
@@ -38,7 +38,7 @@
     <table style="width: 100%; cell-padding: 0; border-collapse: collapse; margin: 0">
       <tr style="background-color: F5F5F5; border-bottom: 1px solid #CCC;" >
         <td style="background-color: #666;">
-          <img src="http://team.trac.im/assets/img/logo.png" style="vertical-align: middle;"/>
+          <img src="${base_url+'/assets/img/logo.png'}" style="vertical-align: middle;" alt=""/>
         </td>
         <td style="padding: 0.5em; background-color: #666; text-align: left;">
           <span style="font-size: 1.3em; color: #FFF; font-weight: bold;">