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

install/requirements.txt

@@ -47,7 +47,7 @@ speaklater==1.3
 sprox==0.9.4
 stevedore==1.1.0
 tg.devtools==2.3.7
-git+https://github.com/algoo/tgapp-resetpassword.git
+git+https://github.com/gasbasd/tgapp-resetpassword.git
 tgext.admin==0.6.4
 tgext.crud==0.7.3
 tgext.pluggable==0.6.2

tracim/tracim/config/app_cfg.py

@@ -173,7 +173,9 @@ class CFG(object):
         :param value:
         :return:
         """
-        if 'PASSWORD' not in key and 'URL' not in key and 'CONTENT' not in key:
+        if 'PASSWORD' not in key and \
+                ('URL' not in key or type(value) == str) and \
+                'CONTENT' not in key:
             # We do not show PASSWORD for security reason
             # we do not show URL because the associated config uses tg.lurl() which is evaluated when at display time.
             # At the time of configuration setup, it can't be evaluated

tracim/tracim/controllers/admin/user.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import uuid
+import random
 
 import pytz
 from tracim import model  as pm
@@ -7,6 +8,7 @@ from tracim import model  as pm
 from sprox.tablebase import TableBase
 from sprox.formbase import EditableForm, AddRecordForm
 from sprox.fillerbase import TableFiller, EditFormFiller
+from tracim.config.app_cfg import CFG
 from tw2 import forms as tw2f
 import tg
 from tg import predicates
@@ -273,6 +275,11 @@ class UserRestController(TIMRestController):
     profile = UserProfileAdminRestController()
     workspaces = UserWorkspaceRestController()
 
+    PASSWORD_LENGTH = 12
+    PASSWORD_CHARACTERS = '0123456789' \
+                          'abcdefghijklmonpqrstuvwxyz' \
+                          'ABCDEFGHIJKLMONPQRSTUVWXYZ'
+
     @classmethod
     def current_item_id_key_in_context(cls):
         return 'user_id'
@@ -326,7 +333,7 @@ class UserRestController(TIMRestController):
             user.password = password
         elif send_email:
             # Setup a random password to send email at user
-            password = str(uuid.uuid4())
+            password = self.generate_password()
             user.password = password
 
         user.webdav_left_digest_response_hash = '%s:/:%s' % (email, password)
@@ -351,6 +358,23 @@ class UserRestController(TIMRestController):
         tg.flash(_('User {} created.').format(user.get_display_name()), CST.STATUS_OK)
         tg.redirect(self.url())
 
+    @classmethod
+    def generate_password(
+            cls,
+            password_length = PASSWORD_LENGTH,
+            password_chars = PASSWORD_CHARACTERS
+            ):
+
+        # character list that will be contained into the password
+        char_list = []
+
+        for j in range(0, password_length):
+            # This puts a random char from the list above inside
+            # the list of chars and then merges them into a String
+            char_list.append(random.choice(password_chars))
+            password = ''.join(char_list)
+        return password
+
     @tg.expose('tracim.templates.admin.user_getone')
     def get_one(self, user_id):
         current_user = tmpl_context.current_user

tracim/tracim/lib/helpers.py

@@ -82,6 +82,14 @@ def time(datetime_object):
     current_locale = tg.i18n.get_lang()[0]
     return format_time(datetime_object, locale=current_locale)
 
+def update_date(datetime_object):
+    current_locale = tg.i18n.get_lang()[0]
+    return format_date(datetime_object, locale=current_locale)
+
+def update_time(datetime_object):
+    current_locale = tg.i18n.get_lang()[0]
+    return format_time(datetime_object, locale=current_locale)
+
 def format_short(datetime_object):
     return datetime_object.strftime(format = plag.Globals.SHORT_DATE_FORMAT.__str__())
 

tracim/tracim/model/data.py

@@ -1039,6 +1039,14 @@ class Content(DeclarativeBase):
         return self.get_current_revision()
 
     @property
+    def first_revision(self) -> ContentRevisionRO:
+        return self.revisions[0]  # FIXME
+
+    @property
+    def last_revision(self) -> ContentRevisionRO:
+        return self.revisions[-1]
+
+    @property
     def is_editable(self) -> bool:
         return not self.is_archived and not self.is_deleted
 

tracim/tracim/model/serializers.py

@@ -388,12 +388,14 @@ def serialize_node_for_page(content: Content, context: Context):
             is_new=content.has_new_information_for(context.get_user()),
             content=data_container.description,
             created=data_container.created,
+            updated=content.last_revision.updated,
             label=data_container.label,
             icon=ContentType.get_icon(content.type),
-            owner=context.toDict(data_container.owner),
+            owner=context.toDict(content.first_revision.owner),
+            last_modification_author=context.toDict(content.last_revision.owner),
             status=context.toDict(data_container.get_status()),
             links=[],
-            revisions=context.toDict(sorted(content.revisions, key=lambda v: v.created, reverse=True)),
+            revision_nb = len(content.revisions),
             selected_revision='latest' if content.revision_to_serialize<=0 else content.revision_to_serialize,
             history=Context(CTX.CONTENT_HISTORY).toDict(content.get_history()),
             is_editable=content.is_editable,
@@ -450,16 +452,19 @@ def serialize_content_for_history(event: VirtualEvent, context: Context):
     )
 
 @pod_serializer(Content, CTX.THREAD)
-def serialize_node_for_page(item: Content, context: Context):
+def serialize_node_for_thread(item: Content, context: Context):
     if item.type==ContentType.Thread:
         return DictLikeClass(
             content = item.description,
             created = item.created,
+            updated = item.last_revision.updated,
+            revision_nb = len(item.revisions),
             icon = ContentType.get_icon(item.type),
             id = item.content_id,
             label = item.label,
             links=[],
             owner = context.toDict(item.owner),
+            last_modification_author=context.toDict(item.last_revision.owner),
             parent = context.toDict(item.parent),
             selected_revision = 'latest',
             status = context.toDict(item.get_status()),
@@ -595,6 +600,9 @@ def serialize_content_for_workspace_and_folder(content: Content, context: Contex
             id=content.content_id,
             label=content.label,
             created=content.created,
+            updated=content.last_revision.updated,
+            last_modification_author=context.toDict(content.last_revision.owner),
+            revision_nb=len(content.revisions),
             workspace=context.toDict(content.workspace),
             allowed_content=DictLikeClass(content.properties['allowed_content']),
             allowed_content_types=context.toDict(content.get_allowed_content_types()),

tracim/tracim/templates/file/getone.mak

@@ -50,7 +50,14 @@
 
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.file.created) %>
-              <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.file.owner.name)|n}</p>
+                <% updated_localized = h.get_with_timezone(result.file.updated) %>
+                <% last_modification_author = result.file.last_modification_author.name %>
+              <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.file.owner.name)|n}
+                  % if result.file.revision_nb > 1:
+                      ${_(' (last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
+                  % endif
+              </p>
+
             </div>
         </div>
     </div>

tracim/tracim/templates/folder/getone.mak

@@ -49,7 +49,13 @@
 
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.folder.created) %>
-              <p>${_('folder created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.folder.owner.name)|n}</p>
+                <% updated_localized = h.get_with_timezone(result.folder.updated) %>
+                <% last_modification_author = result.folder.last_modification_author.name %>
+                <p>${_('folder created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.folder.owner.name)|n}
+                    % if result.folder.revision_nb > 1:
+                      ${_(' (last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
+                    % endif
+                </p>
             </div>
         </div>
     </div>

tracim/tracim/templates/page/getone.mak

@@ -48,7 +48,14 @@
 
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.page.created) %>
-              <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.page.owner.name)|n}</p>
+                <% updated_localized = h.get_with_timezone(result.page.updated) %>
+                <% last_modification_author = result.page.last_modification_author.name %>
+                <p>
+                    ${_('page created on {date} at {time} by <b>{author}</b> ').format(date=h.date(created_localized), time=h.time(created_localized), author=result.page.owner.name)|n}
+                    % if result.page.revision_nb > 1:
+                      ${_('(last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
+                    % endif
+                </p>
             </div>
         </div>
     </div>

tracim/tracim/templates/thread/getone.mak

@@ -50,8 +50,14 @@
 
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.thread.created) %>
-              <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.thread.owner.name)|n}</p>
-            </div>
+                <% updated_localized = h.get_with_timezone(result.thread.updated) %>
+                <% last_modification_author = result.thread.last_modification_author.name %>
+                <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.thread.owner.name)|n}
+                    % if result.thread.revision_nb > 1:
+                      ${_(' (last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
+                    % endif
+                </p>
+
         </div>
     </div>