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

tracim/migration/versions/2cd20ff3d23a_user_timezone.py

@@ -0,0 +1,26 @@
+"""user_timezone
+
+Revision ID: 2cd20ff3d23a
+Revises: b4b8d57b54e5
+Create Date: 2016-11-08 11:32:00.903232
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '2cd20ff3d23a'
+down_revision = 'b4b8d57b54e5'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('timezone', sa.Unicode(length=255), server_default='', nullable=False))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'timezone')
+    ### end Alembic commands ###

tracim/tracim/command/user.py

@@ -3,13 +3,18 @@ import transaction
 from sqlalchemy.exc import IntegrityError
 from tg import config
 
-from tracim.command import AppContextCommand, Extender
+from tracim.command import AppContextCommand
+from tracim.command import Extender
 from tracim.lib.auth.ldap import LDAPAuth
+from tracim.lib.daemons import DaemonsManager
+from tracim.lib.daemons import RadicaleDaemon
 from tracim.lib.email import get_email_manager
-from tracim.lib.exception import AlreadyExistError, CommandAbortedError
+from tracim.lib.exception import AlreadyExistError
+from tracim.lib.exception import CommandAbortedError
 from tracim.lib.group import GroupApi
 from tracim.lib.user import UserApi
-from tracim.model import DBSession, User
+from tracim.model import DBSession
+from tracim.model import User
 
 
 class UserCommand(AppContextCommand):
@@ -109,6 +114,13 @@ class UserCommand(AppContextCommand):
             user.update_webdav_digest_auth(password)
             self._session.add(user)
             self._session.flush()
+
+            # We need to enable radicale if it not already done
+            daemons = DaemonsManager()
+            daemons.run('radicale', RadicaleDaemon)
+
+            user_api = UserApi(user)
+            user_api.execute_created_user_actions(user)
         except IntegrityError:
             self._session.rollback()
             raise AlreadyExistError()

tracim/tracim/controllers/admin/user.py

@@ -313,7 +313,6 @@ class UserRestController(TIMRestController):
             is_tracim_manager = False
             is_tracim_admin = False
 
-
         api = UserApi(current_user)
 
         if api.user_with_email_exists(email):
@@ -348,10 +347,10 @@ class UserRestController(TIMRestController):
             email_manager = get_email_manager()
             email_manager.notify_created_account(user, password=password)
 
+        api.execute_created_user_actions(user)
         tg.flash(_('User {} created.').format(user.get_display_name()), CST.STATUS_OK)
         tg.redirect(self.url())
 
-
     @tg.expose('tracim.templates.admin.user_getone')
     def get_one(self, user_id):
         current_user = tmpl_context.current_user

tracim/tracim/controllers/admin/workspace.py

@@ -5,7 +5,6 @@ from tg import tmpl_context
 from tg.i18n import ugettext as _
 
 from tracim.controllers import TIMRestController
-from tracim.controllers import TIMRestPathContextSetup
 
 
 from tracim.lib import CST
@@ -13,23 +12,13 @@ from tracim.lib.base import BaseController
 from tracim.lib.helpers import on_off_to_boolean
 from tracim.lib.user import UserApi
 from tracim.lib.userworkspace import RoleApi
-from tracim.lib.content import ContentApi
 from tracim.lib.workspace import WorkspaceApi
-from tracim.model import DBSession
 
 from tracim.model.auth import Group
-from tracim.model.data import NodeTreeItem
-from tracim.model.data import Content
-from tracim.model.data import ContentType
-from tracim.model.data import Workspace
 from tracim.model.data import UserRoleInWorkspace
 
 from tracim.model.serializers import Context, CTX, DictLikeClass
 
-from tracim.controllers.content import UserWorkspaceFolderRestController
-
-
-
 
 class RoleInWorkspaceRestController(TIMRestController, BaseController):
 
@@ -198,9 +187,12 @@ class WorkspaceRestController(TIMRestController, BaseController):
         workspace_api_controller = WorkspaceApi(user)
         calendar_enabled = on_off_to_boolean(calendar_enabled)
 
-        workspace = workspace_api_controller.create_workspace(name, description)
-        workspace.calendar_enabled = calendar_enabled
-        DBSession.flush()
+        workspace = workspace_api_controller.create_workspace(
+            name,
+            description,
+            calendar_enabled=calendar_enabled,
+            save_now=True,
+        )
 
         tg.flash(_('{} workspace created.').format(workspace.label), CST.STATUS_OK)
         tg.redirect(self.url())
@@ -228,6 +220,9 @@ class WorkspaceRestController(TIMRestController, BaseController):
         workspace.calendar_enabled = calendar_enabled
         workspace_api_controller.save(workspace)
 
+        if calendar_enabled:
+            workspace_api_controller.ensure_calendar_exist(workspace)
+
         tg.flash(_('{} workspace updated.').format(workspace.label), CST.STATUS_OK)
         tg.redirect(self.url(workspace.workspace_id))
         return

tracim/tracim/controllers/user.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
-
+import pytz
+from webob.exc import HTTPForbidden
 import tg
 from tg import tmpl_context
 from tg.i18n import ugettext as _
-from webob.exc import HTTPForbidden
 
 from tracim.controllers import TIMRestController
 from tracim.lib.user import UserApi
 from tracim.lib.workspace import WorkspaceApi
-
-from tracim.model.serializers import Context, CTX, DictLikeClass
+from tracim.model.serializers import Context
+from tracim.model.serializers import CTX
+from tracim.model.serializers import DictLikeClass
 from tracim import model as pm
 
 
@@ -157,10 +158,14 @@ class UserRestController(TIMRestController):
 
         dictified_user = Context(CTX.USER).toDict(current_user, 'user')
         fake_api = DictLikeClass(next_url=next_url)
-        return DictLikeClass(result=dictified_user, fake_api=fake_api)
+        return DictLikeClass(
+            result=dictified_user,
+            fake_api=fake_api,
+            timezones=pytz.all_timezones,
+        )
 
     @tg.expose('tracim.templates.workspace.edit')
-    def put(self, user_id, name, email, next_url=None):
+    def put(self, user_id, name, email, timezone, next_url=None):
         user_id = tmpl_context.current_user.user_id
         current_user = tmpl_context.current_user
         assert user_id==current_user.user_id
@@ -168,7 +173,8 @@ class UserRestController(TIMRestController):
         # Only keep allowed field update
         updated_fields = self._clean_update_fields({
             'name': name,
-            'email': email
+            'email': email,
+            'timezone': timezone,
         })
 
         api = UserApi(tmpl_context.current_user)

tracim/tracim/lib/app_globals.py

@@ -23,7 +23,6 @@ class Globals(object):
         pass
 
     VERSION_NUMBER = '1.0.3'
-    LONG_DATE_FORMAT = '%A, the %d of %B %Y at %H:%M'
     SHORT_DATE_FORMAT = l_('%B %d at %I:%M%p')
 
 

tracim/tracim/lib/calendar.py

@@ -1,3 +1,4 @@
+import caldav
 import os
 
 import re
@@ -5,6 +6,7 @@ import transaction
 
 from icalendar import Event as iCalendarEvent
 from sqlalchemy.orm.exc import NoResultFound
+from tg import tmpl_context
 from tg.i18n import ugettext as _
 
 from tracim.lib.content import ContentApi
@@ -316,3 +318,44 @@ class CalendarManager(object):
         :return: True if given collection path is an discover path
         """
         return path in ('user', 'workspace')
+
+    def create_then_remove_fake_event(
+            self,
+            calendar_class,
+            related_object_id,
+    ) -> None:
+        radicale_base_url = self.get_base_url()
+        client = caldav.DAVClient(
+            radicale_base_url,
+            username=self._user.email,
+            password=self._user.auth_token,
+        )
+        if calendar_class == WorkspaceCalendar:
+            calendar_url = self.get_workspace_calendar_url(related_object_id)
+        elif calendar_class == UserCalendar:
+            calendar_url = self.get_user_calendar_url(related_object_id)
+        else:
+            raise Exception('Unknown calendar type {0}'.format(calendar_class))
+
+        user_calendar = caldav.Calendar(
+            parent=client,
+            client=client,
+            url=calendar_url
+        )
+
+        event_ics = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Corp.//CalDAV Client//EN
+BEGIN:VEVENT
+UID:{uid}
+DTSTAMP:20100510T182145Z
+DTSTART:20100512T170000Z
+DTEND:20100512T180000Z
+SUMMARY:This is an event
+LOCATION:Here
+END:VEVENT
+END:VCALENDAR
+""".format(uid='{0}FAKEEVENT'.format(related_object_id))
+        event = user_calendar.add_event(event_ics)
+        event.delete()
+

tracim/tracim/lib/content.py

@@ -184,7 +184,7 @@ class ContentApi(object):
         if workspace:
             result = result.filter(Content.workspace_id==workspace.workspace_id)
 
-        if self._user and not self._disable_user_workspaces_filter:
+        if self._user and workspace and not self._disable_user_workspaces_filter:
             user = DBSession.query(User).get(self._user_id)
             # Filter according to user workspaces
             workspace_ids = [r.workspace_id for r in user.roles \

tracim/tracim/lib/helpers.py

@@ -6,11 +6,14 @@
 
 import datetime
 
+import pytz
 import slugify
-from babel.dates import format_date, format_time
+from babel.dates import format_date
+from babel.dates import format_time
 from markupsafe import Markup
 
 import tg
+from tg import tmpl_context
 from tg.i18n import ugettext as _
 
 from tracim.lib import app_globals as plag
@@ -20,7 +23,6 @@ from tracim.lib.base import logger
 from tracim.lib.content import ContentApi
 from tracim.lib.userworkspace import RoleApi
 from tracim.lib.workspace import WorkspaceApi
-from tracim.model import User
 
 from tracim.model.data import ContentStatus
 from tracim.model.data import Content
@@ -28,6 +30,39 @@ from tracim.model.data import ContentType
 from tracim.model.data import UserRoleInWorkspace
 from tracim.model.data import Workspace
 
+
+def get_with_timezone(
+        datetime_object: datetime.datetime,
+        to_timezone: str='',
+        default_from_timezone: str='UTC',
+) -> datetime.datetime:
+    """
+    Change timezone of a date
+    :param datetime_object: datetime to update
+    :param to_timezone: timezone name, if equal to '',
+    try to grap current user timezone. If no given timezone name and no
+    current user timezone, return original date time
+    :param default_from_timezone: datetime original timezone if datetime
+    object is naive
+    :return: datetime updated
+    """
+    # If no to_timezone, try to grab from current user
+    if not to_timezone and tmpl_context.current_user:
+        to_timezone = tmpl_context.current_user.timezone
+
+    # If no to_timezone, return original datetime
+    if not to_timezone:
+        return datetime_object
+
+    # If datetime_object have not timezone, set new from default_from_timezone
+    if not datetime_object.tzinfo:
+        from_tzinfo = pytz.timezone(default_from_timezone)
+        datetime_object = from_tzinfo.localize(datetime_object)
+
+    new_tzinfo = pytz.timezone(to_timezone)
+    return datetime_object.astimezone(new_tzinfo)
+
+
 def date_time_in_long_format(datetime_object, format=''):
 
     current_locale = tg.i18n.get_lang()[0]
@@ -63,17 +98,6 @@ def current_year():
   now = datetime.datetime.now()
   return now.strftime('%Y')
 
-def formatLongDateAndTime(datetime_object, format=''):
-    """ OBSOLETE
-    :param datetime_object:
-    :param format:
-    :return:
-    """
-    if not format:
-        format = plag.Globals.LONG_DATE_FORMAT
-    return datetime_object.strftime(format)
-
-
 
 def icon(icon_name, white=False):
     if (white):

tracim/tracim/lib/radicale/auth.py

@@ -1,6 +1,7 @@
 from tg import config
 
 from tracim.lib.user import UserApi
+from tracim.model import DBSession
 
 
 class Auth(object):
@@ -33,4 +34,5 @@ def is_authenticated(user: str, password: str) -> bool:
     """
     see tracim.lib.radicale.auth.Auth#is_authenticated
     """
+    DBSession.expire_all()
     return Auth.is_authenticated(user, password)

tracim/tracim/lib/user.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-
-__author__ = 'damien'
+import transaction
 
 import tg
 
@@ -8,7 +7,9 @@ from tracim.model.auth import User
 
 from tracim.model import auth as pbma
 from tracim.model import DBSession
-import tracim.model.data as pmd
+
+__author__ = 'damien'
+
 
 class UserApi(object):
 
@@ -30,13 +31,22 @@ class UserApi(object):
     def get_one_by_id(self, id: int) -> User:
         return self._base_query().filter(User.user_id==id).one()
 
-    def update(self, user: User, name: str=None, email: str=None, do_save=True):
+    def update(
+            self,
+            user: User,
+            name: str=None,
+            email: str=None,
+            do_save=True,
+            timezone: str='',
+    ):
         if name is not None:
             user.display_name = name
 
         if email is not None:
             user.email = email
 
+        user.timezone = timezone
+
         if do_save:
             self.save(user)
 
@@ -70,6 +80,27 @@ class UserApi(object):
     def save(self, user: User):
         DBSession.flush()
 
+    def execute_created_user_actions(self, created_user: User) -> None:
+        """
+        Execute actions when user just been created
+        :return:
+        """
+        # NOTE: Cyclic import
+        from tracim.lib.calendar import CalendarManager
+        from tracim.model.organisational import UserCalendar
+
+        created_user.ensure_auth_token()
+
+        # Ensure database is up-to-date
+        DBSession.flush()
+        transaction.commit()
+
+        calendar_manager = CalendarManager(created_user)
+        calendar_manager.create_then_remove_fake_event(
+            calendar_class=UserCalendar,
+            related_object_id=created_user.user_id,
+        )
+
 
 class UserStaticApi(object):
 

tracim/tracim/lib/workspace.py

@@ -1,29 +1,15 @@
 # -*- coding: utf-8 -*-
-
-__author__ = 'damien'
-
-import os
-from datetime import datetime
-from hashlib import sha256
-
-from sqlalchemy import Table, ForeignKey, Column
-from sqlalchemy.types import Unicode, Integer, DateTime, Text
-from sqlalchemy.orm import relation, synonym, contains_eager
-from sqlalchemy.orm import joinedload_all
-import sqlalchemy.orm as sqlao
-import sqlalchemy as sqla
-
-import tg
+import transaction
 
 from tracim.lib.userworkspace import RoleApi
 from tracim.model.auth import Group
 from tracim.model.auth import User
 from tracim.model.data import Workspace
 from tracim.model.data import UserRoleInWorkspace
-
-from tracim.model import auth as pbma
 from tracim.model import DBSession
 
+__author__ = 'damien'
+
 
 class WorkspaceApi(object):
 
@@ -39,10 +25,17 @@ class WorkspaceApi(object):
             filter(UserRoleInWorkspace.user_id==self._user.user_id).\
             filter(Workspace.is_deleted==False)
 
-    def create_workspace(self, label: str, description: str='', save_now:bool=False) -> Workspace:
+    def create_workspace(
+            self,
+            label: str,
+            description: str='',
+            calendar_enabled: bool=False,
+            save_now: bool=False,
+    ) -> Workspace:
         workspace = Workspace()
         workspace.label = label
         workspace.description = description
+        workspace.calendar_enabled = calendar_enabled
 
         # By default, we force the current user to be the workspace manager
         # And to receive email notifications
@@ -56,6 +49,9 @@ class WorkspaceApi(object):
         if save_now:
             DBSession.flush()
 
+        if calendar_enabled:
+            self.execute_created_workspace_actions(workspace)
+
         return workspace
 
     def get_one(self, id):
@@ -125,6 +121,27 @@ class WorkspaceApi(object):
 
         return workspace
 
+    def execute_created_workspace_actions(self, workspace: Workspace) -> None:
+        self.ensure_calendar_exist(workspace)
+
+    def ensure_calendar_exist(self, workspace: Workspace) -> None:
+        # Note: Cyclic imports
+        from tracim.lib.calendar import CalendarManager
+        from tracim.model.organisational import WorkspaceCalendar
+
+        if workspace.calendar_enabled:
+            self._user.ensure_auth_token()
+
+            # Ensure database is up-to-date
+            DBSession.flush()
+            transaction.commit()
+
+            calendar_manager = CalendarManager(self._user)
+            calendar_manager.create_then_remove_fake_event(
+                calendar_class=WorkspaceCalendar,
+                related_object_id=workspace.workspace_id,
+            )
+
 
 class UnsafeWorkspaceApi(WorkspaceApi):
     def _base_query(self):

tracim/tracim/model/__init__.py

@@ -39,8 +39,12 @@ class RevisionsIntegrity(object):
 
 # Global session manager: DBSession() returns the Thread-local
 # session object appropriate for the current web request.
-maker = sessionmaker(autoflush=True, autocommit=False,
-                     extension=ZopeTransactionExtension())
+maker = sessionmaker(
+    autoflush=True,
+    autocommit=False,
+    extension=ZopeTransactionExtension(),
+    expire_on_commit=False,
+)
 DBSession = scoped_session(maker)
 
 # Base class for all of our model classes: By default, the data model is

tracim/tracim/model/auth.py

@@ -68,7 +68,7 @@ class Group(DeclarativeBase):
     group_id = Column(Integer, Sequence('seq__groups__group_id'), autoincrement=True, primary_key=True)
     group_name = Column(Unicode(16), unique=True, nullable=False)
     display_name = Column(Unicode(255))
-    created = Column(DateTime, default=datetime.now)
+    created = Column(DateTime, default=datetime.utcnow)
 
     users = relationship('User', secondary=user_group_table, backref='groups')
 
@@ -121,9 +121,10 @@ class User(DeclarativeBase):
     email = Column(Unicode(255), unique=True, nullable=False)
     display_name = Column(Unicode(255))
     _password = Column('password', Unicode(128))
-    created = Column(DateTime, default=datetime.now)
+    created = Column(DateTime, default=datetime.utcnow)
     is_active = Column(Boolean, default=True, nullable=False)
     imported_from = Column(Unicode(32), nullable=True)
+    timezone = Column(Unicode(255), nullable=False, server_default='')
     _webdav_left_digest_response_hash = Column('webdav_left_digest_response_hash', Unicode(128))
     auth_token = Column(Unicode(255))
     auth_token_created = Column(DateTime)

tracim/tracim/model/data.py

@@ -580,7 +580,7 @@ class ContentRevisionRO(DeclarativeBase):
             column_value = getattr(revision, column_name)
             setattr(new_rev, column_name, column_value)
 
-        new_rev.updated = datetime.now()
+        new_rev.updated = datetime.utcnow()
 
         return new_rev
 
@@ -1009,7 +1009,7 @@ class Content(DeclarativeBase):
 
     def created_as_delta(self, delta_from_datetime:datetime=None):
         if not delta_from_datetime:
-            delta_from_datetime = datetime.now()
+            delta_from_datetime = datetime.utcnow()
 
         return format_timedelta(delta_from_datetime - self.created,
                                 locale=tg.i18n.get_lang()[0])
@@ -1017,7 +1017,7 @@ class Content(DeclarativeBase):
     def datetime_as_delta(self, datetime_object,
                           delta_from_datetime:datetime=None):
         if not delta_from_datetime:
-            delta_from_datetime = datetime.now()
+            delta_from_datetime = datetime.utcnow()
         return format_timedelta(delta_from_datetime - datetime_object,
                                 locale=tg.i18n.get_lang()[0])
 
@@ -1232,7 +1232,7 @@ class VirtualEvent(object):
 
     def created_as_delta(self, delta_from_datetime:datetime=None):
         if not delta_from_datetime:
-            delta_from_datetime = datetime.now()
+            delta_from_datetime = datetime.utcnow()
         return format_timedelta(delta_from_datetime - self.created,
                                 locale=tg.i18n.get_lang()[0])
 
@@ -1240,7 +1240,7 @@ class VirtualEvent(object):
         aff = ''
 
         if not delta_from_datetime:
-            delta_from_datetime = datetime.now()
+            delta_from_datetime = datetime.utcnow()
 
         delta = delta_from_datetime - self.created
         

tracim/tracim/model/serializers.py

@@ -621,8 +621,10 @@ def serialize_content_for_general_list(content: Content, context: Context):
     last_activity_date = content.get_last_activity_date()
     last_activity_date_formatted = format_datetime(last_activity_date,
                                                    locale=tg.i18n.get_lang()[0])
-    last_activity_label = format_timedelta(datetime.now() - last_activity_date,
-                                           locale=tg.i18n.get_lang()[0])
+    last_activity_label = format_timedelta(
+        datetime.utcnow() - last_activity_date,
+        locale=tg.i18n.get_lang()[0],
+    )
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
 
     return DictLikeClass(
@@ -645,7 +647,7 @@ def serialize_content_for_folder_content_list(content: Content, context: Context
     last_activity_date = content.get_last_activity_date()
     last_activity_date_formatted = format_datetime(last_activity_date,
                                                    locale=tg.i18n.get_lang()[0])
-    last_activity_label = format_timedelta(datetime.now() - last_activity_date,
+    last_activity_label = format_timedelta(datetime.utcnow() - last_activity_date,
                                            locale=tg.i18n.get_lang()[0])
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
 
@@ -858,6 +860,7 @@ def serialize_user_list_default(user: User, context: Context):
     result['enabled'] = user.is_active
     result['profile'] = user.profile
     result['has_password'] = user.password!=None
+    result['timezone'] = user.timezone
     return result
 
 
@@ -880,6 +883,7 @@ def serialize_user_for_user(user: User, context: Context):
     result['enabled'] = user.is_active
     result['profile'] = user.profile
     result['calendar_url'] = user.calendar_url
+    result['timezone'] = user.timezone
 
     return result
 

tracim/tracim/templates/admin/workspace_getone.mak

@@ -24,9 +24,8 @@
 <%def name="TITLE_ROW()">
     <div class="row-fluid">
         <div>
-            <%
-                subtitle = _('created on {}').format(h.formatLongDateAndTime(result.workspace.created))
-            %>
+            <% created_localized = h.get_with_timezone(result.workspace.created) %>
+            <% subtitle = _('workspace created on {date} at {time}').format(date=h.date(created_localized), time=h.time(created_localized)) %>
             ${ROW.TITLE_ROW(_('Workspace {}').format(result.workspace.label), 'fa-bank', 'col-md-offset-3 col-md-7', 't-user-color', subtitle)}
         </div>
     </div>

tracim/tracim/templates/file/getone.mak

@@ -48,7 +48,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
-          <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(result.file.created), time=h.time(result.file.created), author=result.file.owner.name)|n}</p>
+            <% 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>
         </div>
     </div>
 </div>
@@ -107,7 +108,8 @@
                 </tr>
                 <tr>
                     <td class="tracim-title">${_('Modified')}</td>
-                    <td>${h.format_short(result.file.created)|n} ${_('by {}').format(result.file.owner.name)}</td>
+                    <% created_localized = h.get_with_timezone(result.file.created) %>
+                    <td>${h.format_short(created_localized)|n} ${_('by {}').format(result.file.owner.name)}</td>
                 </tr>
             </table>
         </div>

tracim/tracim/templates/folder/getone.mak

@@ -46,7 +46,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
-          <p>${_('folder created on {date} at {time} by <b>{author}</b>').format(date=h.date(result.folder.created), time=h.time(result.folder.created), author=result.folder.owner.name)|n}</p>
+            <% 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>
         </div>
     </div>
 </div>

tracim/tracim/templates/page/getone.mak

@@ -47,7 +47,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
-          <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(result.page.created), time=h.time(result.page.created), author=result.page.owner.name)|n}</p>
+            <% 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>
         </div>
     </div>
 </div>

tracim/tracim/templates/search/display.mak

@@ -42,7 +42,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
-##          <p>${_('folder created on {date} at {time} by <b>{author}</b>').format(date=h.date(result.folder.created), time=h.time(result.folder.created), author=result.folder.owner.name)|n}</p>
+            <% 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>
         </div>
     </div>
 </div>

tracim/tracim/templates/thread/getone.mak

@@ -48,7 +48,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
-          <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(result.thread.created), time=h.time(result.thread.created), author=result.thread.owner.name)|n}</p>
+            <% 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>
     </div>
 </div>

tracim/tracim/templates/user_workspace_forms.mak

@@ -115,6 +115,20 @@
                 <span class="info readonly">${_('This calendar URL will work with CalDav compatibles clients')}</span>
                 <input id="calendar" type="text" class="form-control"  disabled="disabled" value="${user.calendar_url}" />
             </div>
+            <div class="form-group">
+                <label for="timezone">${_('Timezone')}</label>
+                <span class="info readonly">${_('Dates will be displayed with this timezone')}</span>
+                <select id="timezone" name="timezone" class="form-control">
+                    <option value=""></option>
+                    % for timezone in timezones:
+                        % if timezone == user.timezone:
+                            <option value="${timezone}" selected>${timezone}</option>
+                        % else:
+                            <option value="${timezone}">${timezone}</option>
+                        % endif
+                    % endfor
+                </select>
+            </div>
         </div>
         <div class="modal-footer">
             <span class="pull-right t-modal-form-submit-button">

tracim/tracim/templates/user_workspace_widgets.mak

@@ -303,6 +303,7 @@
 </%def>
 
 <%def name="SECURED_TIMELINE_ITEM(user, item)">
+##     <% created_localized = h.get_with_timezone(item.created) %>
 ##     <div class="row t-odd-or-even t-hacky-thread-comment-border-top">
 ##         <div class="col-sm-7 col-sm-offset-3">
 ##             <div class="t-timeline-item">
@@ -312,7 +313,7 @@
 ##                 <h5 style="margin: 0;">
 ##                     <span class="tracim-less-visible">${_('<strong>{}</strong> wrote:').format(item.owner.name)|n}</span>
 ##
-##                     <div class="pull-right text-right t-timeline-item-moment" title="${h.date_time(item.created)|n}">
+##                     <div class="pull-right text-right t-timeline-item-moment" title="${h.date_time(created_localized)|n}">
 ##                         ${_('{delta} ago').format(delta=item.created_as_delta)}
 ##
 ##                         % if h.is_item_still_editable(item) and item.owner.id==user.id:
@@ -336,6 +337,7 @@
 </%def>
 
 <%def name="SECURED_HISTORY_VIRTUAL_EVENT(user, event)">
+    <% created_localized = h.get_with_timezone(event.created) %>
     <% is_new_css_class = 't-is-new-content' if event.is_new else '' %>
 
     <div class="row t-odd-or-even t-hacky-thread-comment-border-top ${is_new_css_class}">
@@ -353,7 +355,7 @@
                         <span class="tracim-less-visible">${_('{} by <strong>{}</strong>').format(event.label, event.owner.name)|n}</span>
                     % endif
 
-                    <div class="pull-right text-right t-timeline-item-moment" title="${h.date_time(event.created)|n}">
+                    <div class="pull-right text-right t-timeline-item-moment" title="${h.date_time(created_localized)|n}">
                         ${_('{delta} ago').format(delta=event.created_as_delta)}
 
                         % if h.is_item_still_editable(CFG, event) and event.owner.id==user.id:
@@ -374,6 +376,7 @@
 </%def>
 
 <%def name="SECURED_HISTORY_VIRTUAL_EVENT_AS_TABLE_ROW(user, event, current_revision_id)">
+    <% created_localized = h.get_with_timezone(event.created) %>
     <%
         warning_or_not = ('', 'warning')[current_revision_id==event.id]
         row_css = 't-is-new-content' if event.is_new else warning_or_not
@@ -382,7 +385,7 @@
         <td class="t-less-visible">
             <span class="label label-default">${ICON.FA_FW(event.type.icon)} ${event.type.label}</span>
         </td>
-        <td title="${h.date_time(event.created)|n}">${_('{delta} ago').format(delta=event.created_as_delta)}</td>
+        <td title="${h.date_time(created_localized)|n}">${_('{delta} ago').format(delta=event.created_as_delta)}</td>
         <td>${event.owner.name}</td>
 ## FIXME - REMOVE                            <td>${event}</td>
 

tracim/tracim/templates/workspace/getone.mak

@@ -44,7 +44,8 @@
         </h1>
 
         <div style="margin: -1.5em auto -1.5em auto;" class="t-less-visible">
-          <p>${_('workspace created on {date} at {time}').format(date=h.date(result.workspace.created), time=h.time(result.workspace.created))|n}</p>
+            <% created_localized = h.get_with_timezone(result.workspace.created) %>
+          <p>${_('workspace created on {date} at {time}').format(date=h.date(created_localized), time=h.time(created_localized))|n}</p>
         </div>
     </div>
 </div>

tracim/tracim/tests/__init__.py

@@ -51,7 +51,8 @@ class TestApp(BaseTestApp):
         try:
             super()._check_status(status, res)
         except AppError as exc:
-            dump_file_path = "/tmp/debug_%d_%s.html" % (time.time() * 1000, res.request.path_qs[1:])
+            escaped_page_name = res.request.path_qs[1:].replace('/', '')
+            dump_file_path = "/tmp/debug_%d_%s.html" % (time.time() * 1000, escaped_page_name)
             if os.path.exists("/tmp"):
                 with open(dump_file_path, 'w') as dump_file:
                     print(res.ubody, file=dump_file)
@@ -354,7 +355,7 @@ class BaseTestThread(BaseTest):
         return thread
 
 
-class TestCalendar(TestController):
+class TestCalendar(TracimTestController):
     fixtures = [BaseFixture, TestFixture]
     application_under_test = 'radicale'
 

tracim/tracim/tests/functional/test_calendar.py

@@ -1,14 +1,17 @@
+import os
 import time
 
 import caldav
 import transaction
 from caldav.lib.error import AuthorizationError
+from collections import OrderedDict
 from nose.tools import eq_
 from nose.tools import ok_
 from nose.tools import raises
 import requests
 from requests.exceptions import ConnectionError
 from sqlalchemy.orm.exc import NoResultFound
+from tg import config
 
 from tracim.config.app_cfg import daemons
 from tracim.lib.calendar import CalendarManager
@@ -18,6 +21,7 @@ from tracim.tests import TestCalendar as BaseTestCalendar
 from tracim.tests import not_raises
 from tracim.model.auth import User
 from tracim.model.data import Content
+from tracim.model.data import Workspace
 
 
 class TestCalendar(BaseTestCalendar):
@@ -203,3 +207,108 @@ END:VCALENDAR
         eq_(event.properties['location'], 'Here')
         eq_(event.properties['start'], '2010-05-12 18:00:00+0000')
         eq_(event.properties['end'], '2010-05-12 17:00:00+0000')
+
+    def test_created_user_radicale_calendar(self):
+        self._connect_user(
+            'admin@admin.admin',
+            'admin@admin.admin',
+        )
+
+        user_count = DBSession.query(User)\
+            .filter(User.email == 'an-other-email@test.local').count()
+        eq_(0, user_count, 'User should not exist yet')
+
+        radicale_users_folder = '{0}/user'\
+            .format(config.get('radicale.server.filesystem.folder'))
+        eq_(
+            False,
+            os.path.isdir(radicale_users_folder),
+            'Radicale users folder should not exist yet',
+        )
+
+        # Create a new user, his calendar should be created to
+        try_post_user = self.app.post(
+            '/admin/users',
+            OrderedDict([
+                ('name', 'TEST'),
+                ('email', 'an-other-email@test.local'),
+                ('password', 'an-other-email@test.local'),
+                ('is_tracim_manager', 'off'),
+                ('is_tracim_admin', 'off'),
+                ('send_email', 'off'),
+            ])
+        )
+
+        eq_(try_post_user.status_code, 302,
+            "Code should be 302, but is %d" % try_post_user.status_code)
+
+        users_calendars = len([
+            name for name in os.listdir(radicale_users_folder)
+            if name.endswith('.ics')
+        ])
+
+        user = DBSession.query(User) \
+            .filter(User.email == 'an-other-email@test.local').one()
+
+        eq_(1, users_calendars, 'Radicale user path should list 1 calendar')
+        user_calendar = '{0}/{1}.ics'.format(
+            radicale_users_folder,
+            user.user_id,
+        )
+        user_calendar_exist = os.path.isfile(user_calendar)
+        eq_(True, user_calendar_exist, 'User calendar should be created')
+
+    def test_created_workspace_radicale_calendar(self):
+        self._connect_user(
+            'admin@admin.admin',
+            'admin@admin.admin',
+        )
+
+        workspaces_count = DBSession.query(Workspace)\
+            .filter(Workspace.label == 'WTESTCAL').count()
+        eq_(0, workspaces_count, 'Workspace should not exist yet !')
+
+        radicale_workspaces_folder = '{0}/workspace'\
+            .format(config.get('radicale.server.filesystem.folder'))
+        eq_(
+            False,
+            os.path.isdir(radicale_workspaces_folder),
+            'Radicale workskpaces folder should not exist yet',
+        )
+
+        # Create a new workspace, his calendar should be created to
+        try_post_workspace = self.app.post(
+            '/admin/workspaces',
+            OrderedDict([
+                ('name', 'WTESTCAL'),
+                ('description', 'WTESTCALDESCR'),
+                ('calendar_enabled', 'on'),
+            ])
+        )
+
+        eq_(try_post_workspace.status_code, 302,
+            "Code should be 302, but is %d" % try_post_workspace.status_code)
+
+        workspaces_calendars = len([
+            name for name in os.listdir(radicale_workspaces_folder)
+            if name.endswith('.ics')
+        ])
+
+        workspace = DBSession.query(Workspace) \
+            .filter(Workspace.label == 'WTESTCAL').one()
+
+        eq_(
+            1,
+            workspaces_calendars,
+            'Radicale workspace path should list 1 calendar',
+        )
+        workspace_calendar = '{0}/{1}.ics'.format(
+            radicale_workspaces_folder,
+            workspace.workspace_id,
+        )
+        workspace_calendar_exist = os.path.isfile(workspace_calendar)
+        eq_(
+            True,
+            workspace_calendar_exist,
+            'Workspace calendar should be created',
+        )

tracim/tracim/tests/functional/test_ldap_restrictions.py

@@ -68,6 +68,7 @@ class TestAuthentication(LDAPTest, TracimTestController):
             OrderedDict([
                 ('name', 'Lawrence Lessig YEAH'),
                 ('email', 'An-other-email@fsf.org'),
+                ('timezone', ''),
             ])
         )
 

tracim/tracim/tests/library/test_helpers.py

@@ -1,20 +1,18 @@
 # -*- coding: utf-8 -*-
 
 import datetime
+from unittest.mock import MagicMock
 
+import pytz
+from babel.dates import get_timezone
 from nose.tools import eq_
-from nose.tools import ok_
+from tg.request_local import TurboGearsContextMember
+from tg.util.webtest import test_context
+from tg import tmpl_context
 
 import tracim.lib.helpers as h
 from tracim.config.app_cfg import CFG
-from tracim.model.data import Content
-from tracim.model.data import ContentType
-from tracim.model.data import Workspace
-
-from tracim.model.serializers import Context
-from tracim.model.serializers import CTX
 from tracim.model.serializers import DictLikeClass
-
 from tracim.tests import TestStandard
 
 
@@ -45,3 +43,18 @@ class TestHelpers(TestStandard):
         config.DATA_UPDATE_ALLOWED_DURATION = 8
         item.created = datetime.datetime.now() - datetime.timedelta(0, 10)
         eq_(False, h.is_item_still_editable(config, item))
+
+    def test_unit__change_datetime_timezone__ok__with_naive_and_current_user(self):  # nopep8
+        user_mock = MagicMock(timezone='America/Guadeloupe')
+
+        with test_context(self.app):
+            tmpl_context.current_user = user_mock
+            naive_datetime = datetime.datetime(2000, 1, 1, 0, 0, 0)
+
+            new_datetime = h.get_with_timezone(
+                datetime_object=naive_datetime,
+                default_from_timezone='UTC',
+                to_timezone='',  # user_mock.timezone should be used
+            )
+
+            eq_(str(new_datetime), '1999-12-31 20:00:00-04:00')