Ticket #1269: quickjump+missing-r3431.diff

htdocs/css/search.css

@@ -9 +9 @@
 #results dd { font-size: 80%; margin: 0; padding: 0 }
 #results .author, #results .date, #results .keywords { color: #090 }
 
+#quickjump { font-style: italic; font-weight: bold; }
+
 #paging { margin: 0 0 2em; text-align: center }

trac/ticket/report.py

@@ -490 +490 @@
         if intertrac:
             return intertrac
         report, args, fragment = formatter.split_link(target)
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+        cursor.execute('SELECT id FROM report WHERE id=%s', (report,))
+        exists = bool(cursor.fetchone())
+        class_ = 'report'
+        if not exists:
+            class_ += ' missing'
+            label += '?'
         return html.A(href=formatter.href.report(report) + args,
-                      class_='report')[label]
+                      class_=class_)[label]

trac/ticket/roadmap.py

@@ -518 +518 @@
         yield ('milestone', self._format_link)
 
     def _format_link(self, formatter, ns, name, label):
+        class_ = 'milestone'
+        try:
+            Milestone(self.env, name)
+        except TracError:
+            class_ += ' missing'
+            label += '?'
         return html.A(href=formatter.href.milestone(name),
-                      class_='milestone')[label]
+                      class_=class_)[label]

trac/Search.py

@@ -167 +167 @@
         query = req.args.get('q')
         if query:
             page = int(req.args.get('page', '1'))
-            redir = self.quickjump(req, query)
-            if redir:
-                req.redirect(redir)
+            do_quickjump = int(req.args.get('quickjump', '0'))
+            quickjump_elt = self.quickjump(req, query)
+            if quickjump_elt is not None:
+                quickjump_href = quickjump_elt.attr['href']
+                if do_quickjump:
+                    req.redirect(quickjump_href)
+                else:
+                    req.hdf['search.quickjump'] = {
+                        'href': quickjump_href,
+                        'name': html.EM(quickjump_elt.children),
+                        'description': quickjump_elt.attr.get('title', '')
+                        }
             elif query.startswith('!'):
                 query = query[1:]
             terms = search_terms(query)
@@ -215 +224 @@
         return 'search.cs', None
 
     def quickjump(self, req, kwd):
-        if len(kwd.split()) != 1:
-            return None
         # Source quickjump
         if kwd[0] == '/':
             return req.href.browser(kwd)
         link = wiki_to_link(kwd, self.env, req)
         if isinstance(link, Element):
-            return link.attr['href']
+            return link
 
     # IWikiSyntaxProvider methods
     

templates/header.cs

@@ -45 +45 @@
   <input type="hidden" name="wiki" value="on" />
   <input type="hidden" name="changeset" value="on" />
   <input type="hidden" name="ticket" value="on" />
+  <input type="hidden" name="quickjump" value="1" />
  </div><?cs /if ?>
 </form>
 

templates/search.cs

@@ -37 +37 @@
    <label for="<?cs var:filter.name ?>"><?cs var:filter.label?></label><?cs
   /each ?>
  </p>
-</form>
-<?cs if:len(search.result) ?>
- <hr />
+</form><?cs 
+
+if:len(search.result) || len(search.quickjump) ?>
+ <hr /><?cs
+ if:len(search.result) ?>
  <h2>Search results <?cs
   if:search.n_pages > 1 ?>(<?cs
    var:(search.page-1) * search.page_size + 1 ?> - <?cs
    var:(search.page-1) * search.page_size + len(search.result) ?> 
    of <?cs var:search.n_hits?>)<?cs
-  /if ?></h2>
+  /if ?></h2><?cs
+ /if ?>
  <div id="searchable">
   <dl id="results"><?cs
+   if:len(search.quickjump) ?>
+    <dt id=quickjump><a href="<?cs var:search.quickjump.href ?>">Quickjump to <?cs var:search.quickjump.name ?></a></dt>
+    <dd><?cs var:search.quickjump.description ?></dd><?cs 
+   /if ?><?cs 
    each item=search.result ?>
- <dt><a href="<?cs var:item.href ?>"><?cs var:item.title ?></a></dt>
- <dd><?cs var:item.excerpt ?></dd>
- <dd>
-  <span class="author">By <?cs var:item.author ?></span> &mdash;
-  <span class="date"><?cs var:item.date ?></span><?cs
-  if:item.keywords ?> &mdash
-   <span class="keywords">Keywords: <em><?cs var:item.keywords ?></em></span><?cs
-  /if ?>
- </dd><?cs
+    <dt><a href="<?cs var:item.href ?>"><?cs var:item.title ?></a></dt>
+    <dd><?cs var:item.excerpt ?></dd>
+    <dd>
+     <span class="author">By <?cs var:item.author ?></span> &mdash;
+     <span class="date"><?cs var:item.date ?></span><?cs
+     if:item.keywords ?> &mdash
+      <span class="keywords">Keywords: <em><?cs var:item.keywords ?></em></span><?cs
+     /if ?>
+    </dd><?cs
    /each ?>
   </dl>
   <hr />
@@ -81 +88 @@
   </div><?cs
  /if ?><?cs
 
-elif:search.q ?>
+elif:search.q && !search.quickjump ?>
  <div id="notfound">No matches found.</div><?cs
 /if ?>