Merge pull request #25 from lebouquetin/master

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: python
 python:
   - "3.2"
@@ -20,13 +21,16 @@ install:
   - "pip install -r install/requirements.txt; echo"
   - "./bin/tg2env-patch 2 /home/travis/virtualenv/python3.2.5/lib/python3.2/site-packages"
   - "pip install coveralls"
-  
+
 before_script:
   - "psql -c 'create database tracim_test;' -U postgres"
-  - "cp tracim/development.ini.base tracim/development.ini"
+  - "cp ${TRAVIS_BUILD_DIR}/tracim/development.ini.base ${TRAVIS_BUILD_DIR}/tracim/development.ini"
+#  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox setup-app -c ${TRAVIS_BUILD_DIR}/tracim/test.ini"
+  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox setup-app"
+#  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox migrate -c ${TRAVIS_BUILD_DIR}/tracim/test.ini upgrade"
 
 # command to run tests
-script: "cd tracim && nosetests -v --with-coverage --cover-package=tracim --cover-erase"
+script: "cd ${TRAVIS_BUILD_DIR}/tracim && nosetests -c ${TRAVIS_BUILD_DIR}/tracim/test.ini -v --with-coverage --cover-package=tracim --cover-erase"
 
 after_success:
 - coveralls

tracim/development.ini.base

@@ -62,7 +62,8 @@ beaker.session.validate_key = 3283411b-1904-4554-b0e1-883863b53080
 # invalidate the URI when specifying a SQLite db via path name
 # sqlalchemy.url=postgresql://username:password@hostname:port/databasename
 # sqlalchemy.url=mysql://username:password@hostname:port/databasename
-sqlalchemy.url = postgresql://tracim_user:tracim_user_password@127.0.0.1:5432/tracim?client_encoding=utf8
+# sqlalchemy.url = postgresql://tracim_user:tracim_user_password@127.0.0.1:5432/tracim?client_encoding=utf8
+sqlalchemy.url = postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
 
 #echo shouldn't be used together with the logging module.
 sqlalchemy.echo = false

tracim/setup.py

@@ -47,7 +47,7 @@ setup(
     description='Tracim is plateform software designed to improve traceability and productivity in collaborative work.',
     author='Damien ACCORSI',
     author_email='damien.accorsi@free.fr',
-    url='https://bitbucket.org/lebouquetin/tracim',
+    url='https://github.com/tracim/tracim',
     packages=find_packages(exclude=['ez_setup']),
     install_requires=install_requires,
     include_package_data=True,

tracim/tracim/lib/content.py

@@ -501,7 +501,7 @@ class ContentApi(object):
 
     def mark_read(self, content: Content,
                   read_datetime: datetime=None,
-                  do_flush=True) -> Content:
+                  do_flush: bool=True, recursive: bool=True) -> Content:
 
         assert self._user
         assert content
@@ -521,8 +521,23 @@ class ContentApi(object):
         for revision in viewed_revisions:
             revision.read_by[self._user] = read_datetime
 
-        for child in content.get_valid_children():
-            self.mark_read(child, read_datetime=read_datetime, do_flush=False)
+        if recursive:
+            # mark read :
+            # - all children
+            # - parent stuff (if you mark a comment as read,
+            #                 then you have seen the parent)
+            # - parent comments
+            for child in content.get_valid_children():
+                self.mark_read(child, read_datetime=read_datetime,
+                               do_flush=False)
+
+            if ContentType.Comment == content.type:
+                self.mark_read(content.parent, read_datetime=read_datetime,
+                               do_flush=False, recursive=False)
+                for comment in content.parent.get_comments():
+                    if comment != content:
+                        self.mark_read(comment, read_datetime=read_datetime,
+                                       do_flush=False, recursive=False)
 
         if do_flush:
             self.flush()
@@ -569,9 +584,22 @@ class ContentApi(object):
             content.revision_type = action_description
 
         if do_flush:
+            # INFO - 2015-09-03 - D.A.
+            # There are 2 flush because of the use
+            # of triggers for content creation
+            #
+            # (when creating a content, actually this is an insert of a new
+            # revision in content_revisions ; so the mark_read operation need
+            # to get full real data from database before to be prepared.
+
             DBSession.add(content)
             DBSession.flush()
 
+            # TODO - 2015-09-03 - D.A. - Do not use triggers
+            # We should create a new ContentRevisionRO object instead of Content
+            # This would help managing view/not viewed status
+            self.mark_read(content, do_flush=True)
+
         if do_notify:
             self.do_notify(content)
 

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

@@ -360,3 +360,5 @@ tr.t-is-new-content td, div.row.t-is-new-content {
 }
 
 .panel-heading > h3 { font-size: 1.5em;}
+
+hr.t-toolbar-btn-group-separator { border-color: #CCC; border-style: dotted; }

tracim/tracim/templates/file/toolbar.mak

@@ -6,6 +6,7 @@
     <div class="btn-group btn-group-vertical text-center">
         ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, file)}
     </div>
+    <hr class="t-toolbar-btn-group-separator"/>
     <p></p>
 
     <% download_url = tg.url('/workspaces/{}/folders/{}/files/{}/download?revision_id={}'.format(result.file.workspace.id, result.file.parent.id,result.file.id,result.file.selected_revision)) %>

tracim/tracim/templates/page/forms.mak

@@ -18,7 +18,7 @@
 
                 <div class="form-group">
                     <label for="page-content">${_('Content')}</label>
-                    <iframe id="page-content-textarea" name="content" class="form-control pod-rich-textarea" id="page-content" placeholder="${_('Write here the page content')}"></iframe>
+                    <textarea id="page-content-textarea" name="content" class="form-control pod-rich-textarea" id="page-content" placeholder="${_('Write here the page content')}"></textarea>
                 </div>
             </div>
             <div class="modal-footer">

tracim/tracim/templates/page/toolbar.mak

@@ -5,6 +5,7 @@
     <div class="btn-group btn-group-vertical">
         ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, page)}
     </div>
+    <hr class="t-toolbar-btn-group-separator"/>
     <p></p>
 
     <% edit_disabled = ('', 'disabled')[page.selected_revision!='latest' or page.status.id[:6]=='closed'] %>

tracim/tracim/templates/thread/toolbar.mak

@@ -6,6 +6,7 @@
     <div class="btn-group btn-group-vertical">
         ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, thread)}
     </div>
+    <hr class="t-toolbar-btn-group-separator"/>
     <p></p>
 
     <% edit_disabled = ('', 'disabled')[thread.selected_revision!='latest' or thread.status.id[:6]=='closed'] %>

tracim/tracim/templates/widgets/button.mak

@@ -41,15 +41,17 @@
         if 'latest' != content.selected_revision:
             disabled_or_not = 'disabled'
     %>
+
     % if content.is_new:
-       <a href="${content.urls.mark_read}" class="btn btn-success ${disabled_or_not}" style="text-align: center;">
-           <i class="fa fa-4x fa-fw fa-eye"></i><br/>
+       <a href="${content.urls.mark_read}" class="btn btn-success ${disabled_or_not}">
+           <i class="fa fa-fw fa-inverse fa-eye"></i>
            <span style="color: #FFF">${_('Mark read')}</span>
        </a>
     % else:
-       <a href="${content.urls.mark_unread}" class="btn btn-default ${disabled_or_not}" style="text-align: center;">
-           <i class="fa fa-4x fa-fw fa-eye-slash tracim-less-visible"></i><br/>
+       <a href="${content.urls.mark_unread}" class="btn btn-default ${disabled_or_not}">
+           <i class="fa fa-fw fa-eye-slash t-less-visible"></i>
            <span class="tracim-less-visible">${_('Mark unread')}</span>
        </a>
     % endif
 </%def>
+

tracim/tracim/websetup/schema.py

@@ -28,6 +28,9 @@ def setup_schema(command, conf, vars):
 
     # <websetup.websetup.schema.after.metadata.create_all>
     transaction.commit()
+    print("Create additionnal tables.")
+    model.metadata.create_all(bind=config['tg.app_globals'].sa_engine)
+
     print('Initializing Migrations')
     import alembic.config, alembic.command
     alembic_cfg = alembic.config.Config()