merged master into 85/dev/beta_1.0/archived_deleted_shown

README.md

@@ -318,7 +318,8 @@ The reset password related parameters are the follwoing ones :
 The main parameters for notifications are the following ones:
 
     email.notification.activated = true
-    email.notification.from = Tracim Notification <tracim@tmycompany.com>
+    email.notification.from.email = noreply@trac.im
+    email.notification.from.default_label = Tracim Notification
     email.notification.smtp.server = smtp.mycompany.com
     email.notification.smtp.port = 25
     email.notification.smtp.user = username

install/requirements.txt

@@ -51,7 +51,7 @@ tgapp-resetpassword==0.1.8
 tgext.admin==0.6.4
 tgext.asyncjob==0.3.1
 tgext.crud==0.7.3
-tgext.pluggable==0.5.5
+tgext.pluggable==0.6.2
 transaction==1.4.4
 tw2.core==2.2.2
 tw2.forms==2.2.2.1

tracim/development.ini.base

@@ -176,7 +176,8 @@ website.base_url = http://127.0.0.1:8080
 website.server_name = 127.0.0.1
     
 email.notification.activated = False
-email.notification.from = Tracim Notification <noreply@trac.im>
+email.notification.from.email = noreply@trac.im
+email.notification.from.default_label = Tracim Notifications
 email.notification.content_update.template.html = ./tracim/templates/mail/content_update_body_html.mak
 email.notification.content_update.template.text = ./tracim/templates/mail/content_update_body_text.mak
 email.notification.created_account.template.html = ./tracim/templates/mail/created_account_body_html.mak

tracim/migration/env.py

@@ -65,6 +65,7 @@ def run_migrations_online():
             context.run_migrations()
     finally:
         connection.close()
+        engine.dispose()
 
 if context.is_offline_mode():
     run_migrations_offline()

tracim/tracim/config/app_cfg.py

@@ -202,8 +202,17 @@ class CFG(object):
         self.WEBSITE_SUBTITLE = tg.config.get('website.home.subtitle', '')
         self.WEBSITE_HOME_BELOW_LOGIN_FORM = tg.config.get('website.home.below_login_form', '')
 
+        if tg.config.get('email.notification.from'):
+            raise Exception(
+                'email.notification.from configuration is deprecated. '
+                'Use instead email.notification.from.email and '
+                'email.notification.from.default_label.'
+            )
 
-        self.EMAIL_NOTIFICATION_FROM = tg.config.get('email.notification.from')
+        self.EMAIL_NOTIFICATION_FROM_EMAIL = \
+            tg.config.get('email.notification.from.email')
+        self.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL = \
+            tg.config.get('email.notification.from.default_label')
         self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML = tg.config.get('email.notification.content_update.template.html')
         self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT = tg.config.get('email.notification.content_update.template.text')
         self.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_HTML = tg.config.get(
@@ -327,6 +336,9 @@ class CFG(object):
                 )
             )
 
+        if not self.WSGIDAV_CLIENT_BASE_URL.endswith('/'):
+            self.WSGIDAV_CLIENT_BASE_URL += '/'
+
 
     def get_tracker_js_content(self, js_tracker_file_path = None):
         js_tracker_file_path = tg.config.get('js_tracker_path', None)

tracim/tracim/config/middleware.py

@@ -3,8 +3,7 @@
 
 from tracim.config.app_cfg import base_config
 from tracim.config.environment import load_environment
-from tracim.lib.daemons import DaemonsManager
-from tracim.lib.daemons import RadicaleDaemon
+from sqlalchemy.pool import NullPool
 
 __all__ = ['make_app']
 
@@ -33,6 +32,11 @@ def make_app(global_conf, full_stack=True, **app_conf):
     
    
     """
+    # Configure NullPool for SQLAlchemy id we are in tests: unknown reason
+    # don't close it's connection during test and exceed postgresql limit.
+    if global_conf.get('test') == 'true':
+        global_conf['sqlalchemy.poolclass'] = NullPool
+
     app = make_base_app(global_conf, full_stack=True, **app_conf)
     
     # Wrap your base TurboGears 2 application with custom middleware here

tracim/tracim/controllers/calendar.py

@@ -2,6 +2,7 @@
 import re
 import tg
 from tg import tmpl_context
+from tg.predicates import not_anonymous
 
 from tracim.lib.base import BaseController
 from tracim.lib.calendar import CalendarManager
@@ -16,6 +17,7 @@ class CalendarController(BaseController):
     """
 
     @tg.expose('tracim.templates.calendar.iframe_container')
+    @tg.require(not_anonymous())
     def index(self):
         user = tmpl_context.identity.get('user')
         dictified_current_user = Context(CTX.CURRENT_USER).toDict(user)

tracim/tracim/controllers/content.py

@@ -288,16 +288,16 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
         workspace = tmpl_context.workspace
 
         try:
-            item_saved = False
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(int(item_id), self._item_type, workspace)
+            label_changed = label != item.label
 
             # TODO - D.A. - 2015-03-19
             # refactor this method in order to make code easier to understand
 
             with new_revision(item):
 
-                if comment and label:
+                if (comment and label) or (not comment and label_changed):
                     updated_item = api.update_content(
                         item, label if label else item.label,
                         comment if comment else ''

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

@@ -488,6 +488,18 @@ msgstr "Vous n'êtes pas autorisé à accéder à cette ressource"
 msgid "You're not allowed to access this resource"
 msgstr "Vous n'êtes pas autorisé à accéder à cette ressource"
 
+#: tracim/lib/workspace.py:163 tracim/templates/home.mak:132
+#: tracim/templates/master_no_toolbar_no_login.mak:106
+#: tracim/templates/admin/user_getone.mak:77
+#: tracim/templates/admin/workspace_getall.mak:82
+msgid "Workspace"
+msgstr "Espace de travail"
+
+#: tracim/lib/workspace.py:166 tracim/templates/admin/workspace_getone.mak:13
+#: tracim/templates/admin/workspace_getone.mak:29
+msgid "Workspace {}"
+msgstr "Espace de travail {}"
+
 #: tracim/model/auth.py:97
 msgid "Nobody"
 msgstr "Personne"
@@ -1148,6 +1160,14 @@ msgstr "Calendrier personnel"
 msgid "This calendar URL will work with CalDav compatibles clients"
 msgstr "Cette url de calendrier fonctionne avec les logiciels compatibles CalDav"
 
+#: tracim/templates/user_workspace_forms.mak:119
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+#: tracim/templates/user_workspace_forms.mak:120
+msgid "Dates will be displayed with this timezone"
+msgstr "Les dates seront affichées avec ce fuseau horaire"
+
 #: tracim/templates/user_workspace_widgets.mak:37
 msgid "No folder found."
 msgstr "Aucun dossier."
@@ -1469,6 +1489,18 @@ msgstr ""
 "data-toggle=\"collapse\" data-target=\"#add-role-from-existing-user-"
 "form\">Ajouter un membre</a>."
 
+#: tracim/templates/errors/label_invalid_path.mak:6
+msgid ""
+"Chosen label \"{0}\" is invalid because is in conflict with other "
+"resource."
+msgstr ""
+"Le label \"{0}\" est invalide car il est en conflit avec une autre "
+"ressource."
+
+#: tracim/templates/errors/label_invalid_path.mak:9
+msgid "Go Back"
+msgstr "Retour en arrière"
+
 #: tracim/templates/file/edit.mak:9
 msgid "Edit file"
 msgstr "Modifier le fichier"
@@ -2764,3 +2796,6 @@ msgstr "Supprimer l'espace de travail"
 #~ msgid "Adress to connect to webdav with:"
 #~ msgstr "Adresses pour se connecter à webdav sous :"
 
+#~ msgid "created on {}"
+#~ msgstr "créé le {}"
+

tracim/tracim/lib/calendar.py

@@ -45,10 +45,18 @@ class CalendarManager(object):
         return _('My personal calendar')
 
     @classmethod
-    def get_base_url(cls):
+    def get_base_url(cls, low_level: bool=False) -> str:
+        """
+        :param low_level: If True, use local ip address with radicale port.
+        :return: Radical address base url.
+        """
         from tracim.config.app_cfg import CFG
         cfg = CFG.get_instance()
-        return cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE
+
+        if not low_level:
+            return cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE
+
+        return 'http://127.0.0.1:{0}'.format(cfg.RADICALE_SERVER_PORT)
 
     @classmethod
     def get_user_base_url(cls):
@@ -63,16 +71,30 @@ class CalendarManager(object):
         return os.path.join(cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE, 'workspace/')
 
     @classmethod
-    def get_user_calendar_url(cls, user_id: int):
+    def get_user_calendar_url(
+            cls,
+            user_id: int,
+            low_level: bool=False,
+    ):
         user_path = CALENDAR_USER_URL_TEMPLATE.format(id=str(user_id))
-        return os.path.join(cls.get_base_url(), user_path)
+        return os.path.join(
+            cls.get_base_url(low_level=low_level),
+            user_path,
+        )
 
     @classmethod
-    def get_workspace_calendar_url(cls, workspace_id: int):
+    def get_workspace_calendar_url(
+            cls,
+            workspace_id: int,
+            low_level: bool=False,
+    ):
         workspace_path = CALENDAR_WORKSPACE_URL_TEMPLATE.format(
             id=str(workspace_id)
         )
-        return os.path.join(cls.get_base_url(), workspace_path)
+        return os.path.join(
+            cls.get_base_url(low_level=low_level),
+            workspace_path,
+        )
 
     def __init__(self, user: User):
         self._user = user
@@ -325,16 +347,22 @@ class CalendarManager(object):
             calendar_class,
             related_object_id,
     ) -> None:
-        radicale_base_url = self.get_base_url()
+        radicale_base_url = self.get_base_url(low_level=True)
         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)
+            calendar_url = self.get_workspace_calendar_url(
+                related_object_id,
+                low_level=True,
+            )
         elif calendar_class == UserCalendar:
-            calendar_url = self.get_user_calendar_url(related_object_id)
+            calendar_url = self.get_user_calendar_url(
+                related_object_id,
+                low_level=True,
+            )
         else:
             raise Exception('Unknown calendar type {0}'.format(calendar_class))
 

tracim/tracim/lib/content.py

@@ -366,6 +366,10 @@ class ContentApi(object):
 
     def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', do_save=False, is_temporary: bool=False) -> Content:
         assert content_type in ContentType.allowed_types()
+
+        if content_type == ContentType.Folder and not label:
+            label = self.generate_folder_label(workspace, parent)
+
         content = Content()
         content.owner = self._user
         content.parent = parent
@@ -522,6 +526,10 @@ class ContentApi(object):
             content_query = content_query.filter(
                 Content.parent_id == parent_folder.content_id,
             )
+        else:
+            content_query = content_query.filter(
+                Content.parent_id == None,
+            )
 
         # Filter with workspace
         content_query = content_query.filter(
@@ -567,6 +575,9 @@ class ContentApi(object):
                     .filter(
                         Content.parent_id == folder.content_id,
                     )
+            else:
+                folder_query = folder_query \
+                    .filter(Content.parent_id == None)
 
             # Get thirst corresponding folder
             folder = folder_query \
@@ -1066,3 +1077,25 @@ class ContentApi(object):
             )
         )
         return query.one()
+
+    def generate_folder_label(
+            self,
+            workspace: Workspace,
+            parent: Content=None,
+    ) -> str:
+        """
+        Generate a folder label
+        :param workspace: Future folder workspace
+        :param parent: Parent of foture folder (can be None)
+        :return: Generated folder name
+        """
+        query = self._base_query(workspace=workspace)\
+            .filter(Content.label.ilike('{0}%'.format(
+                _('New folder'),
+            )))
+        if parent:
+            query = query.filter(Content.parent == parent)
+
+        return _('New folder {0}').format(
+            query.count() + 1,
+        )

tracim/tracim/lib/email.py

@@ -103,7 +103,10 @@ class EmailManager(object):
             )
         message = MIMEMultipart('alternative')
         message['Subject'] = subject
-        message['From'] = self._global_config.EMAIL_NOTIFICATION_FROM
+        message['From'] = '{0} <{1}>'.format(
+            self._global_config.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL,
+            self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
+        )
         message['To'] = user.email
 
         text_template_file_path = self._global_config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_TEXT  # nopep8

tracim/tracim/lib/notifications.py

@@ -182,6 +182,24 @@ class EmailNotifier(object):
         self._smtp_config = smtp_config
         self._global_config = global_config
 
+    def _get_sender(self, user: User=None) -> str:
+        """
+        Return sender string like "Bob Dylan
+            (via Tracim) <notification@mail.com>"
+        :param user: user to extract display name
+        :return: sender string
+        """
+        if user is None:
+            return '{0} <{1}>'.format(
+                self._global_config.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL,
+                self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
+            )
+
+        return '{0} ({1}) <{2}>'.format(
+            user.display_name,
+            _('via Tracim'),
+            self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
+        )
 
     def notify_content_update(self, event_actor_id: int, event_content_id: int):
         """
@@ -233,7 +251,7 @@ class EmailNotifier(object):
 
             message = MIMEMultipart('alternative')
             message['Subject'] = subject
-            message['From'] = self._global_config.EMAIL_NOTIFICATION_FROM
+            message['From'] = self._get_sender(user)
             message['To'] = to_addr
 
             body_text = self._build_email_body(self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)

tracim/tracim/lib/webdav/design.py

@@ -5,6 +5,111 @@ from tracim.model.data import VirtualEvent
 from tracim.model.data import ContentType
 from tracim.model import data
 
+# FIXME: fix temporaire ...
+style = """
+.title {
+	background:#F5F5F5;
+	padding-right:15px;
+	padding-left:15px;
+	padding-top:10px;
+	border-bottom:1px solid #CCCCCC;
+	overflow:auto;
+} .title h1 { margin-top:0; }
+
+.content {
+	padding: 15px;
+}
+
+#left{ padding:0; }
+
+#right {
+	background:#F5F5F5;
+	border-left:1px solid #CCCCCC;
+	border-bottom: 1px solid #CCCCCC;
+	padding-top:15px;
+}
+@media (max-width: 1200px) {
+	#right {
+		border-top:1px solid #CCCCCC;
+		border-left: none;
+		border-bottom: none;
+	}
+}
+
+body { overflow:auto; }
+
+.btn {
+	text-align: left;
+}
+
+.table tbody tr .my-align {
+	vertical-align:middle;
+}
+
+.title-icon {
+	font-size:2.5em;
+	float:left;
+	margin-right:10px;
+}
+.title.page, .title-icon.page { color:#00CC00; }
+.title.thread, .title-icon.thread { color:#428BCA; }
+
+/* ****************************** */
+.description-icon {
+	color:#999;
+	font-size:3em;
+}
+
+.description {
+	border-left: 5px solid #999;
+	padding-left: 10px;
+	margin-left: 10px;
+	margin-bottom:10px;
+}
+
+.description-text {
+	display:block;
+	overflow:hidden;
+	color:#999;
+}
+
+.comment-row:nth-child(2n) {
+	background-color:#F5F5F5;
+}
+
+.comment-row:nth-child(2n+1) {
+	background-color:#FFF;
+}
+
+.comment-icon {
+	color:#CCC;
+	font-size:3em;
+	display:inline-block;
+	margin-right: 10px;
+	float:left;
+}
+
+.comment-content {
+	display:block;
+	overflow:hidden;
+}
+
+.comment, .comment-revision {
+	padding:10px;
+	border-top: 1px solid #999;
+}
+
+.comment-revision-icon {
+	color:#777;
+	margin-right: 10px;
+}
+
+.title-text {
+	display: inline-block;
+}
+"""
+
+
 def create_readable_date(created, delta_from_datetime: datetime = None):
     if not delta_from_datetime:
         delta_from_datetime = datetime.now()
@@ -29,10 +134,6 @@ def create_readable_date(created, delta_from_datetime: datetime = None):
     return aff
 
 def designPage(content: data.Content, content_revision: data.ContentRevisionRO) -> str:
-    f = open('tracim/lib/webdav/style.css', 'r')
-    style = f.read()
-    f.close()
-
     hist = content.get_history()
     histHTML = '<table class="table table-striped table-hover">'
     for event in hist:
@@ -134,10 +235,6 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
     return file
 
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
-        f = open('tracim/lib/webdav/style.css', 'r')
-        style = f.read()
-        f.close()
-
         hist = content.get_history()
 
         allT = []

tracim/tracim/lib/webdav/sql_dav_provider.py

@@ -1,7 +1,7 @@
 # coding: utf8
 
 import re
-from os.path import basename, dirname, normpath
+from os.path import basename, dirname
 from sqlalchemy.orm.exc import NoResultFound
 from tracim.lib.webdav.utils import transform_to_bdd
 
@@ -18,6 +18,7 @@ from tracim.lib.user import UserApi
 from tracim.lib.workspace import WorkspaceApi
 from tracim.model.data import Content, Workspace
 from tracim.model.data import ContentType
+from tracim.lib.webdav.utils import normpath
 
 
 class Provider(DAVProvider):

tracim/tracim/lib/webdav/sql_resources.py

@@ -5,8 +5,7 @@ import transaction
 import re
 from datetime import datetime
 from time import mktime
-from os.path import normpath, dirname, basename
-import mimetypes
+from os.path import dirname, basename
 
 from tracim.lib.content import ContentApi
 from tracim.lib.user import UserApi
@@ -24,6 +23,7 @@ from wsgidav import compat
 from wsgidav.dav_error import DAVError, HTTP_FORBIDDEN
 from wsgidav.dav_provider import DAVCollection, DAVNonCollection
 from wsgidav.dav_provider import _DAVResource
+from tracim.lib.webdav.utils import normpath
 
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
 

tracim/tracim/lib/webdav/utils.py

@@ -8,6 +8,7 @@ import time
 from datetime import datetime
 
 import yaml
+from os.path import normpath as base_normpath
 from wsgidav import util
 from wsgidav import compat
 from wsgidav.middleware import BaseMiddleware
@@ -274,3 +275,11 @@ class TracimWsgiDavDebugFilter(BaseMiddleware):
                 dump_content['content'] = ElementTree.tostring(xml, 'utf-8')
 
             f.write(yaml.dump(dump_content, default_flow_style=False))
+
+
+def normpath(path):
+    if path == b'':
+        path = b'/'
+    elif path == '':
+        path = '/'
+    return base_normpath(path)

tracim/tracim/lib/workspace.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import transaction
+
 from sqlalchemy.orm import Query
+from tg.i18n import ugettext as _
 
 from tracim.lib.userworkspace import RoleApi
 from tracim.model.auth import Group
@@ -17,9 +19,12 @@ class WorkspaceApi(object):
     def __init__(self, current_user: User):
         self._user = current_user
 
+    def _base_query_without_roles(self):
+        return DBSession.query(Workspace).filter(Workspace.is_deleted==False)
+
     def _base_query(self):
         if self._user.profile.id>=Group.TIM_ADMIN:
-            return DBSession.query(Workspace).filter(Workspace.is_deleted==False)
+            return self._base_query_without_roles()
 
         return DBSession.query(Workspace).\
             join(Workspace.roles).\
@@ -28,11 +33,14 @@ class WorkspaceApi(object):
 
     def create_workspace(
             self,
-            label: str,
+            label: str='',
             description: str='',
             calendar_enabled: bool=False,
             save_now: bool=False,
     ) -> Workspace:
+        if not label:
+            label = self.generate_label()
+
         workspace = Workspace()
         workspace.label = label
         workspace.description = description
@@ -146,6 +154,19 @@ class WorkspaceApi(object):
     def get_base_query(self) -> Query:
         return self._base_query()
 
+    def generate_label(self) -> str:
+        """
+        :return: Generated workspace label
+        """
+        query = self._base_query_without_roles() \
+            .filter(Workspace.label.ilike('{0}%'.format(
+                _('Workspace'),
+            )))
+
+        return _('Workspace {}').format(
+            query.count() + 1,
+        )
+
 
 class UnsafeWorkspaceApi(WorkspaceApi):
     def _base_query(self):

tracim/tracim/model/__init__.py

@@ -85,7 +85,8 @@ metadata = DeclarativeBase.metadata
 
 def init_model(engine):
     """Call me before using any of the tables or classes in the model."""
-    DBSession.configure(bind=engine)
+    if not DBSession.registry.has():  # Prevent a SQLAlchemy warning
+        DBSession.configure(bind=engine)
 
     # If you are using reflection to introspect your database and create
     # table objects for you, your tables must be defined and mapped inside

tracim/tracim/public/_caldavzap/forms.js

@@ -1666,13 +1666,46 @@ function showEventForm(date, allDay, calEvent, jsEvent, mod, repeatOne, confirmR
 	var cals=globalResourceCalDAVList.sortedCollections;
 	var calendarObj = $('#event_calendar');
 	var calSelected = $('.resourceCalDAV_item.resourceCalDAV_item_selected').attr('data-id');
-		for(var i=0;i<cals.length;i++)
-		{
-			if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
-			{
-				calendarObj.append(new Option(cals[i].displayValue,cals[i].uid));
-			}
-		}
+
+  var calendarsApiHasResponded = false
+	// begin custom code
+  $.ajax({
+    url: '/api/calendars/',
+    method: 'GET',
+    contentType: 'application/json'
+  }).done(function (data) {
+
+    var regExpUser = new RegExp('\/user\/')
+    var regExpWorkspace = new RegExp('\/workspace\/')
+
+    var user_or_workspace
+
+    for(var i=0;i<cals.length;i++)
+    {
+      if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
+      {
+        var currentICS = parseInt(cals[i].displayValue.replace('.ics', ''))
+
+        if (regExpUser.test(cals[i].uid))
+          user_or_workspace = 'user'
+        else if (regExpWorkspace.test(cals[i].uid))
+          user_or_workspace = 'workspace'
+        else
+          user_or_workspace = 'fail'
+
+        var calName = ''
+        var calList_length = data.value_list.length
+        for (var j = 0; j < calList_length; j++) {
+          if (data.value_list[j].id === currentICS && data.value_list[j].type === user_or_workspace) {
+            calName = data.value_list[j].label
+          }
+        }
+
+        calendarObj.append(new Option(calName, cals[i].uid));
+      }
+    }
+    calendarsApiHasResponded = true
+  })
 
 	if(mod=='new')
 	{
@@ -2362,8 +2395,17 @@ function showEventForm(date, allDay, calEvent, jsEvent, mod, repeatOne, confirmR
 			$('#event_details_template').find('svg[data-type="select_icon"]').replaceWith($('<div>').append($(newSVG).clone()).html());
 		}
 		/*************************** END OF BAD HACKS SECTION ***************************/
-		if(calEvent.etag!='')
-			$('#event_calendar').val(calEvent.res_id);
+		if(calEvent.etag!='') {
+      var interval = window.setInterval(function () {
+        if (calendarsApiHasResponded === true) {
+          $('#event_calendar').val(calEvent.res_id);
+          stopInterval()
+        }
+      }, 500)
+      var stopInterval = function () {
+        window.clearInterval(interval)
+      }
+    }
 	}
 
 	if(repeatOne=='editOnly' || $('#recurrenceID').val()!='')

tracim/tracim/public/_caldavzap/resource.js

@@ -503,8 +503,8 @@ function ResourceCalDAVList()
     }).done(function (data) {
       var currentICS = parseInt(inputResource.displayvalue.replace('.ics', ''))
 
-      var regExpUser = new RegExp('\/cal\/user\/')
-      var regExpWorkspace = new RegExp('\/cal\/workspace\/')
+      var regExpUser = new RegExp('\/user\/')
+      var regExpWorkspace = new RegExp('\/workspace\/')
 
       var user_or_workspace
 

tracim/tracim/public/assets/css/dashboard.css

@@ -391,6 +391,14 @@ span.info.readonly {
   font-size: 12px;
 }
 
+.user-edit-form__calendar__url {
+  padding: 8px 15px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background-color: #eee;
+  color: #555;
+}
+
 .folder__filter {
   font-size: 14px;
 }

tracim/tracim/public/assets/js/main.js

@@ -13,4 +13,5 @@ $(document).ready(function () {
       }
     })
   }
+
 })

tracim/tracim/templates/thread/getone.mak

@@ -141,9 +141,7 @@
 % for event in result.thread.history:
     ## TODO - D.A. - 2015-08-20
     ## Allow to show full history (with status change and archive/unarchive)
-    % if event.type.id in ('comment', 'creation'):
-        ${WIDGETS.SECURED_HISTORY_VIRTUAL_EVENT(fake_api.current_user, event)}
-    % endif
+    ${WIDGETS.SECURED_HISTORY_VIRTUAL_EVENT(fake_api.current_user, event)}
 % endfor
 
 ## % for comment in result.thread.comments:

tracim/tracim/templates/user_edit_me.mak

@@ -5,3 +5,9 @@
 
 ${FORMS.USER_EDIT_FORM('user-edit-form', result.user, tg.url('/user/{}?_method=PUT'.format(result.user.id)), next_url=fake_api.next_url)}
 
+<script type="text/javascript">
+  // add select2 for timezone in user edit profile modale
+  $('#timezone').select2({
+    dropdownParent: $("#user-edit-form") // this is a workaround to make select works inside bootstrap modal
+  })
+</script>

tracim/tracim/templates/user_workspace_forms.mak

@@ -57,7 +57,7 @@
                 <span class="pull-right t-modal-form-submit-button">
                     <button id="${dom_id}-submit-button" type="submit" class="btn btn-small btn-success" title="${_('Create this page')}"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                 </span>
-                
+
                 <div style="clear: both;"></div>
             </form>
         </div>
@@ -80,7 +80,7 @@
                 <span class="pull-right t-modal-form-submit-button">
                     <button id="${dom_id}-submit-button" type="submit" class="btn btn-small btn-success" title="${_('Create this page')}"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                 </span>
-                
+
                 <div style="clear: both;"></div>
             </form>
         </div>
@@ -113,7 +113,7 @@
             <div class="form-group">
                 <label for="calendar">${_('Personal calendar')}</label>
                 <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 class="user-edit-form__calendar__url">${user.calendar_url}</div>
             </div>
             <div class="form-group">
                 <label for="timezone">${_('Timezone')}</label>

tracim/tracim/tests/__init__.py

@@ -63,7 +63,15 @@ class TestApp(BaseTestApp):
 
 def load_app(name=application_name):
     """Load the test application."""
-    return TestApp(loadapp('config:test.ini#%s' % name, relative_to=getcwd()))
+    return TestApp(
+        loadapp(
+            'config:test.ini#%s' % name,
+            relative_to=getcwd(),
+            global_conf={
+                'test': 'true',
+            },
+        )
+    )
 
 
 def setup_app(section_name=None):
@@ -156,6 +164,7 @@ def teardown_db():
             logger.debug(teardown_db, 'Exception while trying to remove sequence {}'.format(sequence.name))
 
     transaction.commit()
+    connection.close()
     engine.dispose()
 
 
@@ -249,6 +258,9 @@ class TestController(object):
         DBSession.close()
         daemons.execute_in_thread('radicale', lambda: transaction.commit())
         teardown_db()
+        transaction.commit()
+        DBSession.close_all()
+        config['tg.app_globals'].sa_engine.dispose()
 
 
 class TracimTestController(TestController):