Commit: b6e24976941f65d0d3586a9bbb588d9811de996c - allura (git)

allura

Commit MetaInfo

• Revision: b6e24976941f65d0d3586a9bbb588d9811de996c (tree)
• Time: 2012-03-23 17:34:07
• Author: Yaroslav Luzin <jardev@gmai...>
• Commiter: Yaroslav Luzin

Log Message

Merge branch 'dev' of ssh://git.code.sf.net/p/allura/git

Change Summary

• modified: Allura/allura/templates/widgets/repo/revision.html
• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/templates/tracker/index.html
• modified: ForgeTracker/forgetracker/templates/tracker/milestone.html
• modified: ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tracker_main.py

Incremental Difference

--- a/Allura/allura/templates/widgets/repo/revision.html
+++ b/Allura/allura/templates/widgets/repo/revision.html
@@ -4,42 +4,53 @@
         <div class="first-line">{{g.markdown.convert(h.really_unicode(value.message.split('\n')[0]))}}</div>
         {{g.markdown.convert(h.really_unicode('\n'.join(value.message.split('\n')[1:])))}}
     </div>
-    <h2 class="commit-details">
-        <ul class="commit-links">
-            <li><a class="commit-tree-link" href="{{value.url()}}tree/">Tree</a></li>
-            {% if prev %}
-            <li class="commit-parents">
-              Parent(s):
-              {% for ci in prev %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
-            </li>
-            {% endif %}
-            {% if next %}
-            <li class="commit-children">
-              Child(ren):
-              {% for ci in next %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
-            </li>
-            {% endif %}
-        </ul>
+    <div class="commit-details">
 
-        Authored by
-        {% if value.author_url %}
-            <a href="{{value.author_url}}">{{email_gravatar(value.authored.email, title=h.really_unicode(value.authored.name), size=16)}}</a>
-            <a href="{{value.author_url}}">{{h.really_unicode(value.authored.name)}}</a>
-        {% else %}
-            {{email_gravatar(value.authored.email, title=h.really_unicode(value.authored.name), size=16)}} {{h.really_unicode(value.authored.name)}}
-        {% endif %}
+        <div class="commit-authorship">
+            <p>
+            <label>Authored by:</label>
+            {% if value.author_url %}
+                <a href="{{value.author_url}}">{{email_gravatar(value.authored.email, title=h.really_unicode(value.authored.name), size=16)}}</a>
+                <a href="{{value.author_url}}">{{h.really_unicode(value.authored.name)}}</a>
+            {% else %}
+                {{email_gravatar(value.authored.email, title=h.really_unicode(value.authored.name), size=16)}} {{h.really_unicode(value.authored.name)}}
+            {% endif %}
 
-        {% if value.authored.date %}{{abbr_date(value.authored.date)}}{% endif %}
+            {% if value.authored.date %}{{abbr_date(value.authored.date)}}{% endif %}
+            </p>
 
-        {% if value.committed.email != value.authored.email %}
-            Committed by
-            {% if value.committer_url %}
-                <a href="{{value.committer_url}}">{{email_gravatar(value.committed.email, title=h.really_unicode(value.committed.name), size=16)}}</a>
-                <a href="{{value.committer_url}}">{{h.really_unicode(value.committed.name)}}</a>
-            {% else %}
-                {{email_gravatar(value.committed.email, title=h.really_unicode(value.committed.name), size=16)}} {{h.really_unicode(value.committed.name)}}
+            {% if value.committed.email != value.authored.email %}
+                <p>
+                <label>Committed by:</label>
+                {% if value.committer_url %}
+                    <a href="{{value.committer_url}}">{{email_gravatar(value.committed.email, title=h.really_unicode(value.committed.name), size=16)}}</a>
+                    <a href="{{value.committer_url}}">{{h.really_unicode(value.committed.name)}}</a>
+                {% else %}
+                    {{email_gravatar(value.committed.email, title=h.really_unicode(value.committed.name), size=16)}} {{h.really_unicode(value.committed.name)}}
+                {% endif %}
+                {% if value.committed.date %}{{abbr_date(value.committed.date)}}{% endif %}
+                </p>
             {% endif %}
-            {% if value.committed.date %}{{abbr_date(value.committed.date)}}{% endif %}
-        {% endif %}
-    </h2>
+        </div>
+
+        <div class="commit-links">
+            <a class="commit-tree-link" href="{{value.url()}}tree/">Tree</a>
+            <div class="commit-ancestry">
+                {% if prev %}
+                <p class="commit-parents">
+                  Parent(s):
+                  {% for ci in prev %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
+                </p>
+                {% endif %}
+                {% if next %}
+                <p class="commit-children">
+                  Child(ren):
+                  {% for ci in next %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
+                </p>
+                {% endif %}
+            </div>
+        </div>
+
+        <div class="clearfix"></div>
+    </div>
 </div>

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -85,7 +85,7 @@ class Globals(MappedClass):
     @property
     def not_closed_mongo_query(self):
         return dict(
-            status={'$in': list(self.set_of_open_status_names)})
+            status={'$nin': list(self.set_of_closed_status_names)})
 
     @property
     def closed_query(self):

--- a/ForgeTracker/forgetracker/templates/tracker/index.html
+++ b/ForgeTracker/forgetracker/templates/tracker/index.html
@@ -16,7 +16,7 @@
     {{c.subscribe_form.display(value=subscribed, action='subscribe', style='icon')}}
   {% endif %}
   {% if allow_edit %}
-    <a href="{{tg.url(c.app.url+'edit/', dict(q=url_q, limit=limit, sort=sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
+    <a href="{{tg.url(c.app.url+'edit/', dict(q=url_q, limit=limit, sort=url_sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
   {% endif %}
 {% endblock %}
 

--- a/ForgeTracker/forgetracker/templates/tracker/milestone.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestone.html
@@ -8,7 +8,7 @@
 
 {% block actions %}
 {% if allow_edit %}
-  <a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
+  <a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=url_sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
 {% endif %}
 {% endblock %}
 

--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -3,7 +3,7 @@
       {% if field.name == '_milestone' %}
       <div class="grid-6">{{milestones}}
         <label for="{{field.name}}" class="cr">{{field.label}}:</label>
-        <select name="{{field.name}}" class="wide">
+        <select name="{{field.name}}" id="{{field.name}}" class="wide">
           <option value="" selected="selected">no change</option>
           {% for m in field.milestones %}
             {% if not m.complete %}
@@ -16,7 +16,7 @@
     {% endfor %}
     <div class="grid-6">
       <label for="status" class="cr">Status:</label>
-      <select name="status" class="wide">
+      <select name="status" id="status" class="wide">
         <option value="" selected="selected">no change</option>
         {% for option in globals.all_status_names.split() %}
           <option value="{{option}}">{{option}}</option>
@@ -25,7 +25,7 @@
     </div>
     <div class="grid-6">
       <label for="assigned_to" class="cr">Owner:</label>
-      {{c.user_select.display(name='assigned_to', value='', className='wide')}}
+      {{c.user_select.display(name='assigned_to', id='assigned_to', value='', className='wide')}}
     </div>
     {% set cf_count = 0 %}
     {% for field in globals.custom_fields %}
@@ -36,7 +36,7 @@
         <div class="grid-6">
           <label for="{{field.id}}" class="cr">{{field.label}}:</label>
           {% if field.type == 'boolean' %}
-            <input name="{{field.name}}" type="checkbox" value="True"/>
+            <input name="{{field.name}}" id="{{field.name}}" type="checkbox" value="True"/>
           {% elif field.type == 'select' %}
             <select name="{{field.name}}" class="wide">
               <option value="" selected="selected">no change</option>

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -4,7 +4,7 @@ import Image, StringIO
 import allura
 
 from mock import patch
-from nose.tools import assert_true, assert_false, assert_equal
+from nose.tools import assert_true, assert_false, assert_equal, assert_in
 from formencode.variabledecode import variable_encode
 
 from alluratest.controller import TestController
@@ -692,6 +692,67 @@ class TestFunctionalController(TrackerTestController):
         r = self.app.get('/bugs/1/', dict(page=1, limit=2))
         assert_true('Page 2 of 2' in r)
 
+    def test_bulk_edit_index(self):
+        self.new_ticket(summary='test first ticket', status='open')
+        self.new_ticket(summary='test second ticket', status='accepted')
+        self.new_ticket(summary='test third ticket', status='closed')
+        ThreadLocalORMSession.flush_all()
+        M.MonQTask.run_ready()
+        ThreadLocalORMSession.flush_all()
+        response = self.app.get('/p/test/bugs/?sort=summary+asc')
+        ticket_rows = response.html.find('table', {'class':'ticket-list'}).find('tbody')
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+        edit_link = response.html.find('a',{'title':'Bulk Edit'})
+        expected_link = "/p/test/bugs/edit/?q=%21status%3Awont-fix+%26%26+%21status%3Aclosed&sort=snippet_s+asc&limit=25&page=0"
+        assert_equal(expected_link, edit_link['href'])
+        response = self.app.get(edit_link['href'])
+        ticket_rows = response.html.find('tbody', {'class':'ticket-list'})
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+
+    def test_bulk_edit_milestone(self):
+        self.new_ticket(summary='test first ticket', status='open', _milestone='1.0')
+        self.new_ticket(summary='test second ticket', status='accepted', _milestone='1.0')
+        self.new_ticket(summary='test third ticket', status='closed', _milestone='1.0')
+        ThreadLocalORMSession.flush_all()
+        M.MonQTask.run_ready()
+        ThreadLocalORMSession.flush_all()
+        response = self.app.get('/p/test/bugs/milestone/1.0/?sort=ticket_num+asc')
+        ticket_rows = response.html.find('table', {'class':'ticket-list'}).find('tbody')
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+        assert_in('test third ticket', str(ticket_rows))
+        edit_link = response.html.find('a',{'title':'Bulk Edit'})
+        expected_link = "/p/test/bugs/edit/?q=_milestone%3A1.0&sort=ticket_num_i+asc&limit=25&page=0"
+        assert_equal(expected_link, edit_link['href'])
+        response = self.app.get(edit_link['href'])
+        ticket_rows = response.html.find('tbody', {'class':'ticket-list'})
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+        assert_in('test third ticket', str(ticket_rows))
+
+    def test_bulk_edit_search(self):
+        self.new_ticket(summary='test first ticket', status='open')
+        self.new_ticket(summary='test second ticket', status='open')
+        self.new_ticket(summary='test third ticket', status='closed', _milestone='1.0')
+        ThreadLocalORMSession.flush_all()
+        M.MonQTask.run_ready()
+        ThreadLocalORMSession.flush_all()
+        response = self.app.get('/p/test/bugs/search/?q=status%3Aopen')
+        ticket_rows = response.html.find('table', {'class':'ticket-list'}).find('tbody')
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+        assert_false('test third ticket' in str(ticket_rows))
+        edit_link = response.html.find('a',{'title':'Bulk Edit'})
+        expected_link = "/p/test/bugs/edit/?q=status%3Aopen&limit=25&page=0"
+        assert_equal(expected_link, edit_link['href'])
+        response = self.app.get(edit_link['href'])
+        ticket_rows = response.html.find('tbody', {'class':'ticket-list'})
+        assert_in('test first ticket', str(ticket_rows))
+        assert_in('test second ticket', str(ticket_rows))
+        assert_false('test third ticket' in str(ticket_rows))
+
 class TestMilestoneAdmin(TrackerTestController):
     def _post(self, params, **kw):
         params['open_status_names'] = 'aa bb'

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -57,6 +57,22 @@ search_validators = dict(
     page=validators.Int(if_empty=0),
     sort=validators.UnicodeString(if_empty=None))
 
+def _mongo_col_to_solr_col(name):
+    if name == 'ticket_num':
+        return 'ticket_num_i'
+    elif name == 'summary':
+        return 'snippet_s'
+    elif name == '_milestone':
+        return 'milestone_s'
+    elif name == 'status':
+        return 'status_s'
+    elif name == 'assigned_to':
+        return 'assigned_to_s'
+    else:
+        for field in c.app.globals.sortable_custom_fields_shown_in_search():
+            if name == field['name']:
+                return field['sortable_name']
+
 class W:
     thread=w.Thread(
         page=None, limit=None, page_size=None, count=None,
@@ -382,7 +398,7 @@ class RootController(BaseController):
     @with_trailing_slash
     @h.vardec
     @expose('jinja:forgetracker:templates/tracker/index.html')
-    def index(self, limit=25, columns=None, page=0, sort='ticket_num_i asc', **kw):
+    def index(self, limit=25, columns=None, page=0, sort='ticket_num desc', **kw):
         kw.pop('q', None) # it's just our original query mangled and sent back to us
         result = TM.Ticket.paged_query(c.app.globals.not_closed_mongo_query,
                                         sort=sort, limit=int(limit),
@@ -392,6 +408,11 @@ class RootController(BaseController):
         result['allow_edit'] = has_access(c.app, 'write')()
         result['help_msg'] = c.app.config.options.get('TicketHelpSearch')
         result['url_q'] = c.app.globals.not_closed_query
+        result['url_sort'] = ''
+        if sort:
+            sort_split = sort.split(' ')
+            solr_col = _mongo_col_to_solr_col(sort_split[0])
+            result['url_sort'] = '%s %s' % (solr_col, sort_split[1])
         c.ticket_search_results = W.ticket_search_results
         return result
 
@@ -1413,7 +1434,13 @@ class MilestoneController(BaseController):
             field=self.field,
             milestone=self.milestone,
             total=progress['hits'],
-            closed=progress['closed'])
+            closed=progress['closed'],
+            q=self.progress_key)
+        result['url_sort'] = ''
+        if sort:
+            sort_split = sort.split(' ')
+            solr_col = _mongo_col_to_solr_col(sort_split[0])
+            result['url_sort'] = '%s %s' % (solr_col, sort_split[1])
         c.ticket_search_results = W.ticket_search_results
         c.auto_resize_textarea = W.auto_resize_textarea
         return result