search improvements

amleczko · amleczko · commit 4515c752151c · 2013-05-01T13:33:14.000+02:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,7 +1,7 @@
 1.7.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- search improvements [amleczko]
 
 
 1.7.3 (2013-04-30)
diff --git a/por/dashboard/deform_templates/chosen_multiple.pt b/por/dashboard/deform_templates/chosen_multiple.pt
@@ -0,0 +1,23 @@
+<input type="hidden" name="__start__" value="${field.name}:sequence"/>
+  <select name="${field.name}"
+          id="${field.oid}"
+          multiple="multiple"
+          class="i-can-haz-chzn-select"
+          tal:attributes="size field.widget.size;
+                          style getattr(field.widget, 'style', nothing);
+                          data-placeholder getattr(field.widget, 'placeholder', nothing)">
+   <option tal:repeat="(value, description) field.widget.values"
+           tal:attributes="selected value in cstruct and 'selected';
+                           class field.widget.css_class"
+           value="${value}">${description}</option>
+  </select>
+
+  <script type="text/javascript">
+    deform.addCallback(
+        '${field.oid}',
+        function(oid) {
+            $('#' + oid).chosen();
+        }
+    );
+  </script>
+<input type="hidden" name="__end__" value="${field.name}:sequence"/>
diff --git a/por/dashboard/search.py b/por/dashboard/search.py
@@ -6,7 +6,7 @@
 from sunburnt import SolrInterface
 from pyramid.view import view_config
 from pyramid.url import current_route_url
-from por.models.dashboard import Trac
+from por.models.dashboard import Trac, User
 from por.models import DBSession
 from por.dashboard.lib.widgets import SearchButton, PorInlineForm
 from deform_bootstrap.widget import ChosenMultipleWidget
@@ -41,18 +41,29 @@ def searchable_tracs(request):
 
 
 class SearchSchema(colander.MappingSchema):
+
     tracs = colander.SchemaNode(deform.Set(allow_empty=True),
-                                widget=ChosenMultipleWidget(placeholder=u'Select tracs'),
-                                missing=colander.null,
-                                title=u'')
+                      widget=ChosenMultipleWidget(placeholder=u'Select tracs',
+                                                  style="width:250px"),
+                      missing=colander.null,
+                      title=u'')
+
     realms = colander.SchemaNode(deform.Set(allow_empty=True),
-                                widget=ChosenMultipleWidget(placeholder=u'Select realms',
-                                            values=[('', ''),
-                                                    ('ticket', 'Ticket'),
-                                                    ('wiki', 'Wiki'),
-                                                    ('changeset','Changeset')]),
-                                missing=colander.null,
-                                title=u'')
+               widget=ChosenMultipleWidget(placeholder=u'Select realms',
+                                           style="width:250px",
+                                           values=[('', ''),
+                                                   ('ticket', 'Ticket'),
+                                                   ('wiki', 'Wiki'),
+                                                   ('changeset','Changeset')]),
+               missing=colander.null,
+               title=u'')
+
+    authors = colander.SchemaNode(deform.Set(allow_empty=True),
+                    widget=ChosenMultipleWidget(placeholder=u'Select author',
+                                                 style="width:250px"),
+                    missing=colander.null,
+                    title=u'')
+
     searchable = colander.SchemaNode(typ=colander.String(),
                             title=u'',
                             widget = deform.widget.TextInputWidget(
@@ -72,7 +83,12 @@ def search(request):
             )
 
     tracs = searchable_tracs(request)
-    form['tracs'].widget.values = [('', '')] + [(t.trac_name, t.project_name) for t in tracs]
+    form['tracs'].widget.values = [('', '')] \
+                              + [(t.trac_name, t.project_name) for t in tracs]
+
+    users = DBSession.query(User).order_by(User.fullname)
+    form['authors'].widget.values = [('', '')] \
+                              + [(a.email, a.fullname) for a in users]
 
     controls = request.GET.items()
     if not controls:
@@ -96,37 +112,45 @@ def search(request):
 
     if results:
         docs = [FullTextSearchObject(**doc) for doc in results]
-        base_query = dict(request.params)
         records_len = results.result.numFound
         if not fs.page_start + fs.page_size >= records_len: # end of set
-            next_query = base_query.copy()
-            next_query['page_start'] = fs.page_start + fs.page_size
+            next_query = add_param(request, 'page_start', fs.page_start + fs.page_size)
             next_url = current_route_url(request, _query=next_query)
 
         if not fs.page_start == 0:
             previous_page = fs.page_start - fs.page_size
             if previous_page < 0:
                 previous_page = 0
-            previous_query = base_query.copy()
-            previous_query['page_start'] = previous_page
+            previous_query = add_param(request, 'page_start', previous_page)
             previous_url = current_route_url(request, _query=previous_query)
 
     return {'docs': docs,
             'next': next_url,
             'form': form.render(appstruct=appstruct),
             'previous': previous_url,
+            'add_param': add_param,
             'results': results}
 
 
+def add_param(request, key, value):
+    base_query = request.params.copy()
+    base_query[key] = value
+    return base_query
+
+
 class FullTextSearch(object):
 
-    def __init__(self, request, tracs=None, searchable=None, realms=None):
+    def __init__(self, request, tracs=None, searchable=None,
+                 realms=None, authors=None):
         if not realms:
             realms = []
+        if not authors:
+            authors = []
         self.request = request
-        self.viewable_tracs = list(tracs)
         self.searchable = searchable.split(' ') # always a sequence
+        self.viewable_tracs = list(tracs)
         self.realms = list(realms)
+        self.authors = list(authors)
         self.solr_endpoint = request.registry.settings.get('por.solr')
 
     @property
@@ -193,6 +217,21 @@ def query(items):
                 return ""
         return query(self.realms)
 
+    def _build_author_filter(self, si):
+
+        Q = si.query().Q
+
+        def query(items):
+            if len(items) > 2:
+                return Q(author=items.pop()) | query(items)
+            elif len(items) == 2:
+                return Q(author=items.pop()) | Q(author=items.pop())
+            elif len(items) == 1:
+                return Q(author=items.pop())
+            else:
+                return ""
+        return query(self.authors)
+
     def _do_search(self, sort_by=None):
         si = SolrInterface(self.solr_endpoint)
         query = si.query().field_limit(score=True)
@@ -204,6 +243,10 @@ def _do_search(self, sort_by=None):
         if realm_query:
             query = query.filter(realm_query)
 
+        author_query = self._build_author_filter(si)
+        if author_query:
+            query = query.filter(author_query)
+
         trac_query = self._build_trac_filter(si)
         if trac_query:
             query = query.filter(trac_query)
@@ -253,7 +296,7 @@ def __init__(self, project, realm, id=None, score=None,
         if not author:
             author = ()
         self.project = project
-        self.author = ', '.join(author + involved)
+        self.author = ', '.join(author)
         self.created = created
         self.popularity = popularity
         self.comments = comments
diff --git a/por/dashboard/skins/search.pt b/por/dashboard/skins/search.pt
@@ -12,29 +12,16 @@
           <li tal:condition="previous"><a href="${previous}">Previous</a></li>
           <li tal:condition="next"><a href="${next}">Next</a></li>
         </ul>
-      <table class="table table-bordered time-entries table-condensed table-search">
-            <thead>
-              <tr>
-                <th>type</th>
-                <th>project</th>
-                <th>title</th>
-                <th>description</th>
-                <th>authors</th>
-                <th>score</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr tal:repeat="doc docs">
-                <td>${doc.realm}</td>
-                <td>${doc.project}</td>
-                <td><a href="${request.application_url}/${doc.href()}"
-                    tal:content="structure doc.title"></a></td>
-                <td tal:content="structure doc.oneline"></td>
-                <td>${doc.author}</td>
-                <td>${doc.score}</td>
-              </tr>
-            </tbody>
-          </table>
+        <div id="results">
+          <tal:result repeat="doc docs">
+            <dt><a href="${request.application_url}/${doc.href()}"
+              tal:content="structure doc.title"></a></dt>
+            <dd tal:content="structure doc.oneline"></dd>
+            <dd>By <a href="${request.current_route_url(_query=add_param(request,'authors',doc.author))}">${doc.author}</a>
+              in <a href="${request.current_route_url(_query=add_param(request,'tracs',doc.project))}">${doc.project}</a>
+            </dd>
+          </tal:result>
+          </div>
           <ul class="pager">
             <li tal:condition="previous"><a href="${previous}">Previous</a></li>
             <li tal:condition="next"><a href="${next}">Next</a></li>
diff --git a/por/dashboard/static/css/dashboard.css b/por/dashboard/static/css/dashboard.css
@@ -223,6 +223,18 @@ table.time-entries tbody tr:hover th {
     {display: none;}
 }
 
+div#results dt{
+  margin: 1.5em 0 0;
+}
+
+div#results .author{
+  color: #090;  
+}
+
+div#results dd{
+  font-size: 0.9em;
+  margin: 0.2em 1em;
+}
 
 
 /* XXX unused? */
