Merge branch 'master' of https://bitbucket.org/lebouquetin/protov1

pboard/pboard/controllers/api.py

@@ -14,7 +14,7 @@ from datetime import datetime
 from PIL import Image as pil
 
 import tg
-from tg import expose, flash, require, url, lurl, request, redirect, tmpl_context
+from tg import expose, flash, require, url, lurl, request, response, redirect, tmpl_context
 from tg.i18n import ugettext as _, lazy_ugettext as l_
 from tg import predicates as tgp
 
@@ -27,10 +27,18 @@ from pboard.model import auth as pma
 from pboard.model import serializers as pms
 from pboard import model as pm
 from pboard.lib.auth import can_read, can_write
+import repoze.who.api
 
 from pboard.controllers import apimenu as pcam
 
 
+        who_api = repoze.who.api.get_api(request.environ)
+        creds = {}
+        creds['login'] = email
+        creds['password'] = password
+        authenticated, headers = who_api.login(creds)
+        response.headers = headers
+
 FIXME_ERROR_CODE=-1
 
 

pboard/pboard/controllers/root.py

@@ -163,5 +163,8 @@ class RootController(BaseController):
 
         return dict(search_string=keywords, found_nodes=loFoundNodes)
 
+    @expose('pboard.templates.create_account')
+    def create_account(self):
+        return dict()
 
 

pboard/pboard/lib/dbapi.py

@@ -244,12 +244,13 @@ class PODUserFilteredApiController(object):
     for keyword in plKeywordList:
         loKeywordFilteringClauses.append(pbmd.PBNode.data_label.ilike('%'+keyword+'%'))
         loKeywordFilteringClauses.append(pbmd.PBNode.data_content.ilike('%'+keyword+'%'))
+        loKeywordFilteringClauses.append(pbmd.PBNode.data_file_name.ilike('%'+keyword+'%'))
 
     loKeywordFilteringClausesAsOr = sqla.or_(*loKeywordFilteringClauses) # Combine them with or to a BooleanClauseList
 
-    loResultsForSomeKeywords = DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren"))\
+    loResultsForSomeKeywords = DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).join(pbma.Rights).join(pbma.user_group_table, pbma.Rights.group_id==pbma.user_group_table.columns['group_id'])\
         .filter(loKeywordFilteringClausesAsOr)\
-        .filter(pbmd.PBNode.owner_id.in_(liOwnerIdList))\
+        .filter((pbmd.PBNode.owner_id.in_(liOwnerIdList)) | (pbma.user_group_table.c.user_id.in_(liOwnerIdList) & pbmd.PBNode.is_shared))\
         .order_by(sqla.desc(pbmd.PBNode.node_type))\
         .limit(piMaxNodeNb)\
         .all()

pboard/pboard/templates/create_account.mak

@@ -0,0 +1,22 @@
+<%inherit file="local:templates.master"/>
+<%namespace name="POD" file="pboard.templates.pod"/>
+
+<%def name="title()">
+  pod :: ${_('Create account')}
+</%def>
+
+<div class="row">
+  <div class="span10 offset1">
+    <div class="row">
+      <div class="span10">
+        <div class="well">
+          <h1>pod <small>Simple tool, flexible data.</small></h1>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+${POD.SignUpForm('16em')}
+</div>

pboard/pboard/templates/index.mak

@@ -58,22 +58,30 @@
           </div>
         </div>
 
-        ${POD.SignUpForm('16em')}
-        <!--div class="span2">
-          <div class="row">
-            <p style="border: 1px solid #F00;">
-              Want to try?
-            </p>
-          </div>
-          <div class="row">
-            <p class="btn btn-success">
-              <a class="btn btn-success">
-                <i class="fa fa-2x fa-dot-circle-o"></i>
-                <strong>Sign up</strong>
-              </a>
-            </p>
-          </div>
-        </div-->
+		% if not request.identity:
+        <div class="span3">
+          <div class="well text-center" style="min-height: 16em;">
+			<form action="${tg.url('/login_handler')}">
+			  <fieldset>
+				<legend><i class="fa fa-key" style="vertical-align: baseline !important;"></i> Login</legend>
+				<input class="span2" type="text" id="login" name="login" placeholder="email...">
+				<input class="span2" type="password" id="password" name="password" placeholder="password...">
+				<div class="span2 control-group">
+				  Remember me <input type="checkbox" id="loginremember" name="remember" value="2252000"/>
+				</div>
+				<input type="submit" id="submit" value="Login" />
+			  </fieldset>
+			</form>
+		  </div>
+		</div>
+		% else:
+		<div class="span3">
+          <div class="well text-center" style="min-height: 16em;">
+		    <p>${_('Welcome, ')}${request.identity['user'].display_name}</p>
+			<p>${_('Click on Documents in the top menu to access you data.')}</p>
+		  </div>
+		</div>
+		% endif
       </div>
     </div>
   </div>

pboard/pboard/templates/master.mak

@@ -13,7 +13,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/css/external/font-awesome-4.1.0/css/font-awesome.min.css')}" />
 </head>
 <body class="${self.body_class()}">
-  <script src="http://code.jquery.com/jquery.js"></script>
+  <script src="${tg.url('/javascript/jquery.js')}"></script>
   <script src="${tg.url('/javascript/pod.js')}"></script>
 
   <div class="container">
@@ -186,25 +186,7 @@
             </li>
 
 
-            % if not request.identity:
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> Login</a>
-                <ul class="dropdown-menu pull-right">
-                  <li class="text-center">
-                    <form action="${tg.url('/login_handler')}">
-                      <fieldset>
-                        <legend><i class="fa fa-key" style="vertical-align: baseline !important;"></i> Login</legend>
-                        <input class="span2" type="text" id="login" name="login" placeholder="email...">
-                        <input class="span2" type="password" id="password" name="password" placeholder="password...">
-                        <div class="span2 control-group">
-                          Remember me <input type="checkbox" id="loginremember" name="remember" value="2252000"/>
-                        </div>
-                        <input type="submit" id="submit" value="Login" />
-                      </fieldset>
-                    </form>
-                 </ul>
-              </li>
-            % else:
+            % if request.identity:
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> ${request.identity['user'].display_name}</a>
                 <ul class="dropdown-menu pull-right">