remove useless commented code + share properties + link node with owner

pboard/pboard/model/data.py

@@ -9,6 +9,7 @@ from hashlib import sha256
 import bs4
 from sqlalchemy import Table, ForeignKey, Column, Sequence
 from sqlalchemy.types import Unicode, Integer, DateTime, Text, LargeBinary
+import sqlalchemy.types as sqlat
 from sqlalchemy.orm import relation, synonym, relationship
 from sqlalchemy.orm import backref
 import sqlalchemy.orm as sqlao
@@ -18,40 +19,7 @@ from tg.i18n import ugettext as _, lazy_ugettext as l_
 
 import tg
 from pboard.model import DeclarativeBase, metadata, DBSession
-
-# This is the association table for the many-to-many relationship between
-# groups and permissions.
-"""pod_node_table = Table('pod_nodes', metadata,
-    Column('node_id', Integer, Sequence('pod_nodes__node_id__sequence'), primary_key=True),
-    Column('parent_id', Integer, ForeignKey('pod_nodes.node_id'), nullable=True, default=None),
-    Column('node_order', Integer, nullable=True, default=1),
-    Column('node_type',   Unicode(16), unique=False, nullable=False, default='data'),
-    Column('node_status', Unicode(16), unique=False, nullable=False, default='new'),
-
-    Column('created_at', DateTime, unique=False, nullable=False),
-    Column('updated_at', DateTime, unique=False, nullable=False),
-
-    Column('data_label',   Unicode(1024), unique=False, nullable=False, default=''),
-    Column('data_content', Text(), unique=False, nullable=False, default=''),
-    Column('data_datetime', DateTime, unique=False, nullable=False),
-    Column('data_reminder_datetime', DateTime, unique=False, nullable=True),
-    
-    Column('data_file_name', Unicode(255), unique=False, nullable=False, default=''),
-    Column('data_file_mime_type', Unicode(255), unique=False, nullable=False, default=''),
-    Column('data_file_content', LargeBinary(), unique=False, nullable=False, default=None),
-)
-"""
-"""
-- node_type
-
-- node_created_at
-- node_updated_at
-
-- data_label
-- data_content
-- data_source_url
-- data_status_id
-"""
+from pboard.model import auth as pma
 
 class PBNodeStatusItem(object):
   def __init__(self, psStatusId, psStatusLabel, psStatusFamily, psIconId, psCssClass): #, psBackgroundColor):
@@ -143,8 +111,7 @@ class PBNodeStatus(object):
       PBNodeStatus.StatusList['closed'],
       PBNodeStatus.StatusList['deleted']
     ]
-    
-    PBNodeStatus.StatusList.values()
+
     
   @classmethod
   def getStatusItem(cls, psStatusId):
@@ -182,6 +149,7 @@ class PBNode(DeclarativeBase):
     return len(self._lStaticChildList)
 
   __tablename__ = 'pod_nodes'
+
   node_id          = Column(Integer, Sequence('pod_nodes__node_id__sequence'), primary_key=True)
   parent_id        = Column(Integer, ForeignKey('pod_nodes.node_id'), nullable=True, default=None)
   node_depth       = Column(Integer, unique=False, nullable=False, default=0)
@@ -195,6 +163,21 @@ class PBNode(DeclarativeBase):
   created_at = Column(DateTime, unique=False, nullable=False)
   updated_at = Column(DateTime, unique=False, nullable=False)
 
+  """
+    if 1, the document is available for other users logged into pod.
+    default is 0 (private document)
+  """
+  is_shared = Column(sqlat.Boolean, unique=False, nullable=False, default=False)
+  """
+    if 1, the document is available through a public - but obfuscated, url
+    default is 0 (document not publicly available)
+  """
+  is_public = Column(sqlat.Boolean, unique=False, nullable=False, default=False)
+  """
+    here is the hash allowing to get the document publicly
+  """
+  public_url_key = Column(Unicode(1024), unique=False, nullable=False, default='')
+
   data_label   = Column(Unicode(1024), unique=False, nullable=False, default='')
   data_content = Column(Text(),        unique=False, nullable=False, default='')
   
@@ -207,6 +190,7 @@ class PBNode(DeclarativeBase):
 
 
   _oParent = relationship('PBNode', remote_side=[node_id], backref='_lAllChildren')
+  _oOwner = relationship('User', remote_side=[pma.User.user_id], backref='_lAllNodes')
 
   def getChildrenOfType(self, plNodeTypeList, poKeySortingMethod=None, pbDoReverseSorting=False):
     """return all children nodes of type 'data' or 'node' or 'folder'"""
@@ -230,9 +214,15 @@ class PBNode(DeclarativeBase):
   def getChildNb(self):
     return self.getChildNbOfType([PBNodeType.Data])
 
-  def getChildren(self):
+  def getChildren(self, pbIncludeDeleted=False):
     """return all children nodes of type 'data' or 'node' or 'folder'"""
-    return self.getChildrenOfType([PBNodeType.Node, PBNodeType.Folder, PBNodeType.Data])
+    # return self.getChildrenOfType([PBNodeType.Node, PBNodeType.Folder, PBNodeType.Data])
+    items = self.getChildrenOfType([PBNodeType.Node, PBNodeType.Folder, PBNodeType.Data])
+    items2 = list()
+    for item in items:
+      if pbIncludeDeleted==True or item.node_status!='deleted':
+        items2.append(item)
+    return items2
 
   def getContacts(self):
     """return all children nodes of type 'data' or 'node' or 'folder'"""
@@ -343,13 +333,23 @@ class PBNode(DeclarativeBase):
           break
       return PBNodeStatus.getStatusItem(lsRealStatusId)
 
-  def getTruncatedLabel(self, piCharNb):
-    lsTruncatedLabel = ''
+  def getTruncatedLabel(self: PBNode, piCharNb: int):
+    """
+    return a truncated version of the data_label property.
+    if piCharNb is not > 0, then the full data_label is returned
+    note: if the node is a file and the data_label is empty, the file name is returned
+    """
+    lsTruncatedLabel = self.data_label
+
+    # 2014-05-06 - D.A. - HACK
+    # if the node is a file and label empty, then use the filename as data_label
+    if self.node_type==PBNodeType.File and lsTruncatedLabel=='':
+      lsTruncatedLabel = self.data_file_name
+
     liMaxLength = int(piCharNb)
-    if len(self.data_label)>liMaxLength:
-      lsTruncatedLabel = self.data_label[0:liMaxLength-1]+'…'
-    else:
-      lsTruncatedLabel = self.data_label
+    if liMaxLength>0 and len(lsTruncatedLabel)>liMaxLength:
+      lsTruncatedLabel = lsTruncatedLabel[0:liMaxLength-1]+'…'
+
     return lsTruncatedLabel
 
   def getTruncatedContentAsText(self, piCharNb):
@@ -387,29 +387,3 @@ class PBNode(DeclarativeBase):
     # Does not match @@ at end of content.
 
 
-
-"""from sqlalchemy.orm import mapper
-mapper(
-  PBNode,
-  pod_node_table,
-  properties = {'_lAllChildren' : relationship(PBNode, backref=backref('_oParent', remote_side=PBNode.parent_id)) }
-)"""
-
-
-
-"""    children = relationship('TreeNode',
-
-                        # cascade deletions
-                        cascade="all",
-
-                        # many to one + adjacency list - remote_side
-                        # is required to reference the 'remote' 
-                        # column in the join condition.
-                        backref=backref("parent", remote_side='TreeNode.id'),
-
-                        # children will be represented as a dictionary
-                        # on the "name" attribute.
-                        collection_class=attribute_mapped_collection('name'),
-                    ) 
-"""
-

pboard/pboard/templates/document-widgets-tabs.mak

@@ -0,0 +1,333 @@
+<%inherit file="local:templates.master"/>
+<%namespace name="POD" file="pboard.templates.pod"/>
+<%namespace name="DOC" file="pboard.templates.document-widgets"/>
+
+<%def name="AccessManagementTab(poNode)">
+  ######
+  ##
+  ## THIS WIDGET IS INTENDED TO BE USED ONE TIME ONLY IN A PAGE
+  ##
+  <h4>${_('Share options')}</h4> 
+  <p>
+    This document is
+    % if poNode.is_shared==False:
+      <span class="label label-info">
+        <i class="fa fa-user"></i>
+        ${_('private')}
+      </span>
+    % else:
+      <span class="label label-info">
+        <i class="fa fa-group"></i>
+        ${_('collaborative')}
+      </span>
+    % endif
+  </p>
+  <p>
+    % if poNode.is_shared==True or poNode.is_shared==False:
+      ${_('People working on it are:')}
+######
+##
+## FIXME - SHOW LIST OF GROUPS ALLOWED TO WORK ON THE DOCUMENT
+##
+    <table class="table table-striped table-hover table-condensed">
+      <thead>
+        <tr>
+          <th><i class="fa fa-group"></i> ${_('Groups')}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tr>
+        <td>Recherche et Développement</td>
+        <td>
+          <span class="label label-success" title="${_('Read access')}">R</span>
+          <span class="label label-warning" title="${_('Write access')}">W</span>
+        </td>
+      </tr>
+      <thead>
+        <tr>
+          <th><i class="fa fa-user"></i> ${_('Users')}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tr>
+        <td>Damien Accorsi</td>
+        <td>
+          <span class="label label-success">R</span>
+        </td>
+      </tr>
+      <tr>
+        <td>Sylvain Ferot</td>
+        <td>
+          <span class="label label-success">R</span>
+          <span class="label label-warning">W</span>
+        </td>
+      </tr>
+    </table>
+    
+    % endif
+  <p>
+
+######
+##
+## 2014-05-06 - D.A. We do not share documents on internet yet.
+##
+##  <p>
+##    % if poNode.is_public==False:
+##      ${_('This document is not shared on internet')|n}
+##    % else:
+##      ${_('This document is <span class="label label-warning"><i class="fa fa-globe"></i><span>shared</span></span> on internet')|n}.
+##      ${_('The associated url is:')} <a href="FIXME">${poNode.public_url_key}</a>
+##    % endif
+##  </p>
+  <!-- Button to trigger modal -->
+  <a href="#edit-document-share-properties" role="button" class="btn btn-success" data-toggle="modal">
+    <i class="fa fa-edit"></i>
+    ${_('Edit share options')}
+  </a>
+     
+  <!-- Modal -->
+  <div
+    id="edit-document-share-properties"
+    class="modal hide"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="myModalLabel"
+    aria-hidden="true">
+    
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      <h3 id="myModalLabel">Document sharing options</h3>
+    </div>
+    <div class="modal-body">
+
+      <form id='document-share-form' method="GET" action="${tg.url('/api/set_access_management?node_id=%d'%poNode.node_id)}">
+        <fieldset>
+          <label class="checkbox">
+            <input name="is_shared" type="checkbox" id="document-share-selector" ${('', 'checked')[poNode.is_shared]}/>
+            ${_('Share document with collaborators.')} <i class="fa fa-group"></i>
+          </label>
+          <div id="document-share-people-selector">
+            <p>
+              ${_('Select read and write access for each group or people...')}</p>
+            <script>
+            function updateRights(psUserId) {
+              var ACCESS_NONE = '';
+              var ACCESS_READ = 'R';
+              var ACCESS_WRITE = 'RW';
+              
+              var nodeIdForSelectedUser = 'user-'+psUserId+'-value';
+              var widget = $('#'+nodeIdForSelectedUser);
+              var oldValue = widget.val();
+              var newValue = '';
+              if(oldValue==ACCESS_NONE) {
+                newValue = ACCESS_READ;
+                newHtml = '<span class="label label-success">R</span>';
+              } else if(oldValue==ACCESS_READ) {
+                newValue = ACCESS_WRITE;
+                newHtml = '<span class="label label-success">R</span> <span class="label label-warning">W</span>';
+              } else if (oldValue==ACCESS_WRITE) {
+                newValue = ACCESS_NONE;
+                newHtml = '';
+              } else {
+                newValue = ACCESS_READ;
+                newHtml = '<span class="label label-success">R</span>';
+              }
+              
+              widget.val(newValue);
+              visibleid = 'user-'+psUserId+'-rights';
+              $("#"+visibleid).html(newHtml);
+            }
+            </script>
+            
+            <table class="table table-striped table-hover table-condensed">
+              <thead>
+                <tr>
+                  <th></th>
+                  <th>${_('Group')}</th>
+                  <th>${_('Access')}</th>
+                </tr>
+              </thead>
+    ######
+    ##
+    ## FIXME - SET A DYNAMIC SELECT LIST HERE
+    ##
+              % for loCurrentUser in ((3, 'Research and Development'), (4, 'Sylvain Ferot'), (5, 'Damien Accorsi')):
+              <tr id='user-${loCurrentUser[0]}-rights-row'>
+                <td>
+                  <a
+                    class="btn btn-mini"
+                    onclick="updateRights(${loCurrentUser[0]})"
+                  >
+                    <i class="fa fa-key"></i>
+                  </a>
+                </td>
+                <td class='pod-highlightable-access-management-cell'>
+                  ${loCurrentUser[1]}
+                  <input
+                    type="hidden"
+                    id="user-${loCurrentUser[0]}-value"
+                    name="user[${loCurrentUser[0]}]"
+                    value=""
+                  />
+                </td>
+                <td id="user-${loCurrentUser[0]}-rights" class="pod-right-cell"></td>
+              </tr>
+              % endfor
+            </table>
+          </div>
+        </fieldset>
+######
+##
+## 2014-05-06 - D.A. The documents are not yet sharable through internet
+##
+##        <fieldset>
+##          <label class="checkbox">
+##            <input name="is_public" type="checkbox" id="document-public-selector" ${('', 'checked')[poNode.is_public]}/>
+##            ${_('Internet shared document')}
+##            <i class="fa fa-globe"></i>
+##          </label>
+##          <label id="document-public-key-selector">
+##            ${_('Key')}
+##            <div class="input-append">
+##              <input name="url_public_key" id="document-public-key" type="text">
+##              <span id="document-public-key-refresh-button" class="add-on btn" title="${_('Regenerate key')}">
+##                <i class="fa fa-refresh"></i>
+##              </span>
+##            </div>
+##            <p><a id='document-public-key-url' href="">http://share.pod.com/document/azefnzeioguneriugnreiugnre</a></p>
+##          </label>
+
+        </fieldset>
+####
+## Button replaced by modal dialog button
+##        <button type="submit" class="btn btn-success">
+##          <i class="fa fa-check"></i>
+##          ${_('Save')}
+##        </button>
+      </form>
+    </div>
+    <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">
+      <i class="fa fa-ban"></i> ${_('Cancel')}
+    </button>
+    <button class="btn btn-success" id="document-share-form-submit-button">
+      <i class="fa fa-check"></i> ${_('Save changes')}
+    </button>
+    </div>
+    <script>
+##
+## 2014-05-06 - D.A. - Documents are not yet sharable through internet
+##
+##        function refreshDocumentPublicKey(psNewPublicKey) {
+##          var lsNewUrl = 'http://share.pod.com/document/'+psNewPublicKey;
+##          $('#document-public-key').val(psNewPublicKey);
+##          $('#document-public-key-url').attr('href', lsNewUrl);
+##          $('#document-public-key-url').text(lsNewUrl);
+##        }
+      
+      function toggleDocumentSharePeopleSelector(pbShowIt) {
+        if (pbShowIt) {
+          $('#document-share-people-selector').show();
+          // $('#document-share-people-selector input').removeAttr("disabled");
+        } else {
+          $('#document-share-people-selector').hide();
+          // $('#document-share-people-selector input').prop('disabled', 'disabled');
+        }
+      }
+
+##
+## 2014-05-06 - D.A. - Documents are not yet sharable through internet
+##
+##        function toggleDocumentPublicKeyGenerator(pbShowIt) {
+##          if (pbShowIt) {
+##            $('#document-public-key-selector input').removeAttr("disabled");
+##            $('#document-public-key-refresh-button').removeProp('disabled');
+##            $('#document-public-key-refresh-button').removeClass('btn-disabled');
+##            $('#document-public-key-selector a').show();
+##            $('#document-public-key-refresh-button').on("click").click(function () {
+##              refreshDocumentPublicKey(generateStringId()); // New random 32-char id
+##            });
+##            if($('#document-public-key-selector input').val()=='') {
+##              refreshDocumentPublicKey(generateStringId());
+##            }
+##          } else {
+##            $('#document-public-key-refresh-button').prop('disabled', true);
+##            $('#document-public-key-refresh-button').addClass('btn-disabled');
+##            $('#document-public-key-selector input').prop('disabled', 'disabled');
+##            $('#document-public-key-refresh-button').off("click");
+##            $('#document-public-key-selector a').hide();
+##          }
+##        }
+##
+##
+##
+
+      // Callbacks setup
+      $('#document-share-selector').change(function () {
+        var checkedValue = $('#document-share-selector').prop("checked");
+        toggleDocumentSharePeopleSelector(checkedValue);
+      });
+
+##        $('#document-public-selector').change(function () {
+##          var checkedValue = $('#document-public-selector').prop("checked");
+##          toggleDocumentPublicKeyGenerator(checkedValue);
+##        });
+
+      // Submit access-management modal dialog form
+      $('#document-share-form-submit-button').click(function(){
+        $('#document-share-form')[0].submit();
+      });
+
+      // Initial setup
+      // Activate or disactivate users selector according
+      // to current state of the is_shared property
+      //
+      // FIXME - 2014-05-06 - This is not working (should be done at document.ready time)
+      // note: putting this in a document.ready callback does not work.
+      //
+      $('#document-share-form')[0].reset();
+      toggleDocumentSharePeopleSelector($('#document-share-selector').prop("checked"));
+##        toggleDocumentPublicKeyGenerator($('#document-public-selector').prop("checked"));  
+##        
+##        refreshDocumentPublicKey($('#document-public-key').val()); // First init
+
+    </script>
+  </div>
+</%def>
+
+<%def name="FilesTabContent(poNode)">
+  <h4>${_('Attachments')}</h4> 
+% if len(poNode.getFiles())<=0:
+  <p class="pod-grey">${_("There is currently no attachment.")}<br/></p>
+  <p>${POD.OpenModalButton('create-new-file-modal-form', _(' Attach first file'))}</p>
+% else:
+  <p>${POD.OpenModalButton('create-new-file-modal-form', _(' Attach a file'))}</p>
+% endif
+
+  ${DOC.FileEditModalDialog(poNode.node_id, None, tg.url('/api/create_file'), 'create-new-file-modal-form', 'Add a new file')}
+
+
+  <!-- LIST OF FILES -->
+  <div>
+    % if len(poNode.getFiles())>0:
+      % for loFile in poNode.getFiles():
+        <p style="list-style-type:none; margin-bottom: 0.5em;">
+          <i class="fa fa-paperclip"></i>
+          <a
+            href="${tg.url('/document/%i'%loFile.node_id)}"
+            title="${_('View the attachment')}: ${loFile.getTruncatedLabel(-1)}"
+          >
+            ${loFile.getTruncatedLabel(50)}
+          </a>
+          <a
+            class="pull-right"
+            href="${tg.url('/api/get_file_content/%s'%(loFile.node_id))}"
+            title="${_('View the attachment')}"
+          >
+            <i class="fa fa-download"></i>
+          </a>
+        </p>
+      % endfor
+    % endif
+  </div>
+</%def>