Commit: 0891930e3979da21ed0c27ea03ed877ce8559e43 - allura (git)

allura

Commit MetaInfo

• Révision: 0891930e3979da21ed0c27ea03ed877ce8559e43 (tree)
• l'heure: 2012-03-22 04:33:16
• Auteur: Yaroslav Luzin <jardev@gmai...>
• Commiter: Yaroslav Luzin

Message de Log

Merge branch 'master' into t27_donotshowcss

Change Summary

• modified: Allura/allura/command/set_neighborhood_level.py
• modified: Allura/allura/config/middleware.py
• modified: Allura/allura/controllers/repository.py
• modified: Allura/allura/lib/app_globals.py
• modified: Allura/allura/lib/exceptions.py
• modified: Allura/allura/lib/zarkov_helpers.py
• modified: Allura/allura/model/discuss.py
• add: Allura/allura/public/nf/images/spinner.gif
• add: Allura/allura/templates/repo/barediff.html
• modified: Allura/allura/templates/repo/commit.html
• modified: Allura/allura/templates/repo/diff.html
• modified: Allura/allura/templates/widgets/repo/revision.html
• modified: Allura/allura/tests/model/test_discussion.py
• modified: Allura/allura/tests/test_commands.py
• add: Allura/allura/tests/test_zarkov_helpers.py
• modified: ForgeTracker/forgetracker/templates/tracker/index.html
• modified: ForgeTracker/forgetracker/templates/tracker/mass_edit.html
• modified: ForgeTracker/forgetracker/templates/tracker/milestone.html
• modified: ForgeTracker/forgetracker/templates/tracker/search.html
• modified: ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
• modified: ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
• modified: ForgeTracker/forgetracker/tracker_main.py
• modified: ForgeTracker/forgetracker/widgets/ticket_search.py
• modified: requirements.txt

Modification

--- a/Allura/allura/command/set_neighborhood_level.py
+++ b/Allura/allura/command/set_neighborhood_level.py
@@ -1,8 +1,8 @@
-from . import base
+from allura.command import base
 
 from bson import ObjectId
 from allura import model as M
-from allura.lib import plugin
+from allura.lib import plugin, exceptions
 from ming.orm import session
 
 
@@ -12,8 +12,9 @@ class SetNeighborhoodLevelCommand(base.Command):
     min_args = 3
     max_args = 3
     usage = "<ini file> <neighborhood> <level>"  # not sure if we need ini file
-    summary = "Change neighborhood level. <neighgborhood> - " \
-              "should neightborhood's name or id"
+    summary = "Change the neighborhood level\r\n" \
+        "\t<neighgborhood> - the neighborhood name or object id\r\n" \
+        "\t<level> - silver, gold or platinum"
     parser = base.Command.standard_parser(verbose=True)
 
     def command(self):
@@ -21,15 +22,17 @@ class SetNeighborhoodLevelCommand(base.Command):
         n_id = self.args[1]
         n_level = self.args[2]
         if n_level not in ["silver", "gold", "platinum"]:
-            base.log.error("You must select one of three level types (silver, gold, or platinum)")
-            return
+            raise exceptions.NoSuchNBLevelError("%s is not a valid " \
+                "neighborhood level. The valid levels are \"silver\", " \
+                "\"gold\" and \"platinum\"" % n_level)
 
         n = M.Neighborhood.query.get(name=n_id)
         if not n:
             n = M.Neighborhood.query.get(_id=ObjectId(n_id))
 
         if not n:
-            base.log.error("The neighborhood % scould not be found" % n_id)
+            raise exceptions.NoSuchNeighborhoodError("The neighborhood %s " \
+                "could not be found in the database" % n_id)
         else:
             n.level = n_level
             if n_level == "gold":

--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -87,10 +87,10 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
 
     if config.get('zarkov.host'):
         try:    
-            from zarkov import client as zclient
-        except ImportError, e:
-            raise ImportError, "Unable to import the zarkov library. Please"\
-                               " check that zarkov is installed or comment out"\
+            import zmq
+        except ImportError:
+            raise ImportError, "Unable to import the zmq library. Please"\
+                               " check that zeromq is installed or comment out"\
                                " the zarkov.host setting in your ini file."
 
     app = tg.TGApp()

--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -384,6 +384,8 @@ class CommitBrowser(BaseController):
         result = dict(commit=self._commit)
         if self._commit:
             result.update(self._commit.context())
+        result['artifacts'] = [(t,f) for t in ('added', 'removed', 'changed', 'copied')
+                                     for f in self._commit.diffs[t]]
         return result
 
     @expose('jinja:allura:templates/repo/commit_basic.html')
@@ -473,6 +475,9 @@ class FileBrowser(BaseController):
         elif 'diff' in kw:
             tg.decorators.override_template(self.index, 'jinja:allura:templates/repo/diff.html')
             return self.diff(kw['diff'])
+        elif 'barediff' in kw:
+            tg.decorators.override_template(self.index, 'jinja:allura:templates/repo/barediff.html')
+            return self.diff(kw['barediff'])
         else:
             force_display = 'force' in kw
             context = self._blob.context()

--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -4,14 +4,11 @@
 
 __all__ = ['Globals']
 import logging
-import socket
 import cgi
 import json
 import shlex
 import datetime
 from urllib import urlencode
-from ConfigParser import RawConfigParser
-from collections import defaultdict
 
 import pkg_resources
 
@@ -21,7 +18,6 @@ import pygments
 import pygments.lexers
 import pygments.formatters
 import pygments.util
-import webob.exc
 from tg import config, session
 from pylons import c, request
 from paste.deploy.converters import asbool, asint
@@ -31,11 +27,6 @@ import ew as ew_core
 import ew.jinja2_ew as ew
 from ming.utils import LazyProperty
 
-try:
-    from zarkov import client as zclient
-except ImportError:
-    zclient = None
-
 import allura.tasks.event_tasks
 from allura import model as M
 from allura.lib.markdown_extensions import ForgeExtension
@@ -45,6 +36,7 @@ from allura.lib import helpers as h
 from allura.lib.widgets import analytics
 from allura.lib.security import Credentials
 from allura.lib.async import Connection, MockAMQ
+from allura.lib.zarkov_helpers import ZarkovClient, zmq
 
 log = logging.getLogger(__name__)
 
@@ -173,7 +165,7 @@ class Globals(object):
             mount_point=None,
             is_project_member=False)
 
-        if not zclient:
+        if not zmq:
             return
 
         user = user or getattr(c, 'user', None)
@@ -197,7 +189,7 @@ class Globals(object):
 
         try:
             if self._zarkov is None:
-                self._zarkov = zclient.ZarkovClient(
+                self._zarkov = ZarkovClient(
                     config.get('zarkov.host', 'tcp://127.0.0.1:6543'))
             self._zarkov.event(event_type, context, extra)
         except Exception, ex:

--- a/Allura/allura/lib/exceptions.py
+++ b/Allura/allura/lib/exceptions.py
@@ -5,6 +5,7 @@ class NoSuchProjectError(ForgeError): pass
 class NoSuchNeighborhoodError(ForgeError): pass
 class MailError(ForgeError): pass
 class AddressException(MailError): pass
+class NoSuchNBLevelError(ForgeError): pass
 
 class CompoundError(ForgeError):
     def __repr__(self):

--- a/Allura/allura/lib/zarkov_helpers.py
+++ b/Allura/allura/lib/zarkov_helpers.py
@@ -1,6 +1,24 @@
 import calendar
 from datetime import datetime, timedelta
 
+try:
+    import zmq
+except ImportError:
+    zmq = None
+import bson
+
+class ZarkovClient(object):
+
+    def __init__(self, addr):
+        context = zmq.Context.instance()
+        self._sock = context.socket(zmq.PUSH)
+        self._sock.connect(addr)
+
+    def event(self, type, context, extra=None):
+        obj = dict(
+            type=type, context=context, extra=extra)
+        self._sock.send(bson.BSON.encode(obj))
+
 def zero_fill_zarkov_result(zarkov_data, period, start_date, end_date):
     """Return a new copy of zarkov_data (a dict returned from a zarkov
     query) with the timeseries data zero-filled for missing dates.
@@ -36,10 +54,8 @@ def zero_fill_time_series(time_series, period, start_date, end_date):
         time_series (list): A list of [timestamp, value] pairs, e.g.:
             [[1306886400000.0, 1], [1309478400000.0, 0]]
         period (str): 'month' or 'date' for monthly or daily timestamps
-        start_date (datetime or str): Start of the date range. If a str is
-            passed, it must be in %Y-%m-%d format.
-        end_date (datetime or str): End of the date range. If a str is
-            passed, it must be in %Y-%m-%d format.
+        start_date (datetime): Start of the date range.
+        end_date (datetime or str): End of the date range.
 
     Returns:
         list. A new copy of time_series, zero-filled.

--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -172,8 +172,10 @@ class Thread(Artifact):
         Feed.post(self, title=p.subject, description=p.text)
         return p
 
-    def post(self, text, message_id=None, parent_id=None, timestamp=None, **kw):
-        require_access(self, 'post')
+    def post(self, text, message_id=None, parent_id=None,
+             timestamp=None, ignore_security=False, **kw):
+        if not ignore_security:
+            require_access(self, 'post')
         if self.ref_id and self.artifact:
             self.artifact.subscribe()
         if message_id is None: message_id = h.gen_message_id()
@@ -190,7 +192,7 @@ class Thread(Artifact):
         if timestamp is not None: kwargs['timestamp'] = timestamp
         if message_id is not None: kwargs['_id'] = message_id
         post = self.post_class()(**kwargs)
-        if has_access(self, 'unmoderated_post')():
+        if ignore_security or has_access(self, 'unmoderated_post')():
             log.info('Auto-approving message from %s', c.user.username)
             post.approve()
         else:

Binary files /dev/null and b/Allura/allura/public/nf/images/spinner.gif differ

--- /dev/null
+++ b/Allura/allura/templates/repo/barediff.html
@@ -0,0 +1,10 @@
+{% if a.has_image_view and b.has_image_view %}
+  <img src="{{a.url()}}?format=raw"
+       alt="{{h.text.truncate(a._commit._id, 10)}}"
+       title="{{h.text.truncate(a._commit._id, 10)}}"/>
+  <img src="{{b.url()}}?format=raw"
+       alt="{{h.text.truncate(b._commit._id, 10)}}"
+       title="{{h.text.truncate(b._commit._id, 10)}}"/>
+{% else %}
+  {{g.highlight(diff, lexer='diff')}}
+{% endif %}

--- a/Allura/allura/templates/repo/commit.html
+++ b/Allura/allura/templates/repo/commit.html
@@ -15,38 +15,47 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
 {% endblock %}
 
 {% block content %}
-  {{ clone_info(c.app.repo) }}
+{{ clone_info(c.app.repo) }}
 {{c.revision_widget.display(value=commit, prev=prev, next=next)}}
 <table>
   <tbody>
-    {% for diff in commit.diffs.added %}
+    {% for type, file in artifacts %}
     <tr>
-      <td>add</td>
-      <td><a href="{{commit.url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a></td>
-    </tr>
-    {% endfor %}{% for diff in commit.diffs.removed %}
-    <tr>
-      <td>remove</td>
-      <td><a href="{{prev[0].url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a></td>
-    </tr>
-    {% endfor %}{% for diff in commit.diffs.changed %}
-    <tr>
-      <td>change</td>
-      <td>
-        <a href="{{commit.url()}}tree{{h.really_unicode(diff)}}">{{h.really_unicode(diff)}}</a>
-        <a href="{{commit.url()}}tree{{h.really_unicode(diff)}}?diff={{prev[0].object_id}}">(diff)</a>
-      </td>
-    </tr>
-    {% endfor %}{% for diff in commit.diffs.copied %}
-    <tr>
-      <td>copy</td>
-      <td>
-        <a href="{{prev[0].url()}}tree{{h.really_unicode(diff.old)}}">{{h.really_unicode(diff.old)}}</a>
-        <br/>to<br/>
-        <a href="{{commit.url()}}tree{{h.really_unicode(diff.new)}}">{{h.really_unicode(diff.new)}}</a>
-      </td>
+        <td>{{ type }}</td>
+        <td><a href="#diff-{{loop.index}}">{{h.really_unicode(file)}}</a></td>
     </tr>
     {% endfor %}
   </tbody>
 </table>
+
+{% for type, file in artifacts %}
+        <div class="inline-diff">
+            <h6>
+            {% if type in ('added', 'changed') %}
+                <a href="{{commit.url()}}tree{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
+                <a class="commit-diff-link" href="{{commit.url()}}tree{{h.really_unicode(file)}}?diff={{prev[0].object_id}}">Diff</a>
+            {% elif type == 'removed' %}
+                <a href="{{prev[0].url()}}tree{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
+            {% elif type == 'copied' %}
+                <a href="{{prev[0].url()}}tree{{h.really_unicode(file.old)}}">{{h.really_unicode(file.old)}}</a>
+                to
+                <a href="{{commit.url()}}tree{{h.really_unicode(file.new)}}">{{h.really_unicode(file.new)}}</a>
+            {% endif %}
+            </h6>
+            <div id="diff-{{loop.index}}" class="inline-diff-body">
+                {% if type != 'removed' %}
+                <img src="{{g.forge_static('images/spinner.gif')}}" class="loading_icon" alt="Loading..."/>
+                {% else %}
+                <span class="empty-diff">File was removed.</span>
+                {% endif %}
+            </div>
+        </div>
+    {% if type != 'removed' %}
+        <script type="text/javascript">
+            $(document).ready(function() {
+                $('#diff-{{loop.index}}').load('{{commit.url()}}tree{{h.really_unicode(file)}}?barediff={{prev[0].object_id}}');
+            });
+        </script>
+    {% endif %}
+{% endfor %}
 {% endblock %}

--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -2,12 +2,16 @@
 {% do g.register_forge_css('css/forge/hilite.css') %}
 
 {% block title %}
-  {{c.project.name}} / {{c.app.config.options.mount_label}} / Diff of {{h.really_unicode(a.path())}}
+  {{c.project.name}} / {{c.app.config.options.mount_label}} / Diff of {{h.really_unicode(b.path())}}
 {% endblock %}
 
 {% block header %}Diff of
 <a href="{{b.url()}}">{{b.path()}}</a>
+{% if a %}
 <a href="{{a.url()}}">{{a.commit.shorthand_id()}}</a>
+{% else %}
+[000000]
+{% endif %}
 ..
 <a href="{{b.url()}}">{{b.commit.shorthand_id()}}</a>
 {% endblock %}

--- a/Allura/allura/templates/widgets/repo/revision.html
+++ b/Allura/allura/templates/widgets/repo/revision.html
@@ -1,38 +1,45 @@
 {% from 'allura:templates/jinja_master/lib.html' import email_gravatar, abbr_date with context %}
-<p>
-{% if value.author_url %}
-  Authored by
-  <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 %}
-  Authored by
-  {{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.committed.email != value.authored.email %}
-  {% if value.committer_url %}
-    Committed by
-    <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 %}
-    Committed by
-    {{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 %}
-{% endif %}
-</p>
+<div class="commit-details">
+    <div class="commit-message">
+        <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>
 
-<p><a href="{{value.url()}}tree/">Tree</a></p>
-{% if prev %}
-<p>
-  Parent(s):
-  {% for ci in prev %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
-</p>
-{% endif %}
-{% if next %}
-<p>
-  Child(ren):
-  {% for ci in next %}<a href="{{ci.url()}}">{{ci.shorthand_id()}}</a>{% endfor %}
-</p>
-{% endif %}
-{{g.markdown.convert(h.really_unicode(value.message))}}
+        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 %}
+
+        {% if value.authored.date %}{{abbr_date(value.authored.date)}}{% endif %}
+
+        {% 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)}}
+            {% endif %}
+            {% if value.committed.date %}{{abbr_date(value.committed.date)}}{% endif %}
+        {% endif %}
+    </h2>
+</div>

--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -11,7 +11,7 @@ from nose.tools import assert_raises, assert_equals, with_setup
 import mock
 
 from ming.orm.ormsession import ThreadLocalORMSession
-from webob import Request, Response
+from webob import Request, Response, exc
 
 from allura import model as M
 from allura.lib.app_globals import Globals
@@ -192,4 +192,14 @@ def test_post_delete():
     ThreadLocalORMSession.flush_all()
     p.delete()
 
-
+@with_setup(setUp, tearDown)
+def test_post_permission_check():
+    d = M.Discussion(shortname='test', name='test')
+    t = M.Thread(discussion_id=d._id, subject='Test Thread')
+    c.user = M.User.anonymous()
+    try:
+        p1 = t.post('This post will fail the check.')
+        assert False, "Expected an anonymous post to fail."
+    except exc.HTTPUnauthorized:
+        pass
+    p2 = t.post('This post will pass the check.', ignore_security=True)
\ No newline at end of file

--- a/Allura/allura/tests/test_commands.py
+++ b/Allura/allura/tests/test_commands.py
@@ -4,7 +4,7 @@ from datadiff.tools import assert_equal
 import pylons
 
 from alluratest.controller import setup_basic_test, setup_global_objects
-from allura.command import script
+from allura.command import script, set_neighborhood_level
 from allura import model as M
 
 
@@ -23,3 +23,14 @@ def test_script():
     cmd.run([test_config, 'allura/tests/tscript.py' ])
     cmd.command()
     assert_raises(ValueError, cmd.run, [test_config, 'allura/tests/tscript_error.py' ])
+
+def test_set_neighborhood_level():
+    neighborhood = M.Neighborhood.query.find().first()
+    n_id = neighborhood._id
+
+    cmd = set_neighborhood_level.SetNeighborhoodLevelCommand('setnblevel')
+    cmd.run([test_config, str(n_id), 'gold'])
+    cmd.command()
+
+    neighborhood = M.Neighborhood.query.get(_id=n_id)
+    assert neighborhood.level == 'gold'

--- /dev/null
+++ b/Allura/allura/tests/test_zarkov_helpers.py
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+import unittest
+from calendar import timegm
+from datetime import datetime
+
+import bson
+import mock
+
+from allura.lib import zarkov_helpers as zh
+
+class TestZarkovClient(unittest.TestCase):
+
+    def setUp(self):
+        addr = 'tcp://0.0.0.0:0'
+        ctx = mock.Mock()
+        self.socket = mock.Mock()
+        ctx.socket = mock.Mock(return_value=self.socket)
+        PUSH=mock.Mock()
+        with mock.patch('allura.lib.zarkov_helpers.zmq') as zmq:
+            zmq.PUSH=PUSH
+            zmq.Context.instance.return_value = ctx
+            self.client = zh.ZarkovClient(addr)
+        zmq.Context.instance.assert_called_once_with()
+        ctx.socket.assert_called_once_with(PUSH)
+        self.socket.connect.assert_called_once_with(addr)
+
+    def test_event(self):
+        self.client.event('test', dict(user='testuser'))
+        obj = bson.BSON.encode(dict(
+                type='test',
+                context=dict(user='testuser'),
+                extra=None))
+        self.socket.send.assert_called_once_with(obj)
+
+class TestZeroFill(unittest.TestCase):
+
+    def setUp(self):
+        self.dt_begin = datetime(2010, 6, 1)
+        self.dt_end = datetime(2011, 7, 1)
+        ts_begin = timegm(self.dt_begin.timetuple())
+        ts_end = timegm(self.dt_end.timetuple())
+        self.ts_ms_begin = ts_begin * 1000.0
+        self.ts_ms_end = ts_end * 1000.0
+        self.zarkov_data = dict(
+            a=dict(
+                a1=[ (self.ts_ms_begin, 1000), (self.ts_ms_end, 1000) ],
+                a2=[ (self.ts_ms_begin, 1000), (self.ts_ms_end, 1000) ] ),
+            b=dict(
+                b1=[ (self.ts_ms_begin, 2000), (self.ts_ms_end, 2000) ],
+                b2=[ (self.ts_ms_begin, 2000), (self.ts_ms_end, 2000) ] ))
+
+    def test_to_utc_timestamp(self):
+        self.assertEqual(
+            zh.to_utc_timestamp(self.dt_begin),
+            self.ts_ms_begin)
+        self.assertEqual(
+            zh.to_utc_timestamp(self.dt_end),
+            self.ts_ms_end)
+
+    def test_zero_fill_time_series_month(self):
+        result = zh.zero_fill_time_series(
+            self.zarkov_data['a']['a1'], 'month',
+            datetime(2010, 5, 1), datetime(2011, 9, 1))
+        self.assertEqual(result[0][1], 0)
+        self.assertEqual(result[-1][1], 0)
+        self.assertEqual(len(result), 17)
+        self.assertEqual(result[1][1], 1000)
+        self.assertEqual(result[-3][1], 1000)
+        days_ms = 24 * 3600 * 1000
+        min_delta = 28 * days_ms
+        max_delta= 31 * days_ms
+        for p1, p2 in zip(result, result[1:]):
+            delta = p2[0]-p1[0]
+            assert min_delta <= delta <= max_delta, delta
+
+    def test_zero_fill_time_series_date(self):
+        result = zh.zero_fill_time_series(
+            self.zarkov_data['a']['a1'], 'date',
+            datetime(2010, 5, 1), datetime(2011, 9, 1))
+        self.assertEqual(len(result), 489)
+        days_ms = 24 * 3600 * 1000
+        for p1, p2 in zip(result, result[1:]):
+            delta = p2[0]-p1[0]
+            assert delta == days_ms
+
+    def test_zero_fill_zarkov_month_dt(self):
+        result = zh.zero_fill_zarkov_result(
+            self.zarkov_data, 'month',
+            datetime(2010, 5, 1), datetime(2011, 9, 1))
+        a_result = result['a']['a1']
+        b_result = result['b']['b2']
+        self.assertEqual(a_result[0][1], 0)
+        self.assertEqual(a_result[-1][1], 0)
+        self.assertEqual(len(a_result), 17)
+        self.assertEqual(a_result[1][1], 1000)
+        self.assertEqual(a_result[-3][1], 1000)
+        self.assertEqual(b_result[0][1], 0)
+        self.assertEqual(b_result[-1][1], 0)
+        self.assertEqual(len(b_result), 17)
+        self.assertEqual(b_result[1][1], 2000)
+        self.assertEqual(b_result[-3][1], 2000)
+
+    def test_zero_fill_zarkov_month_str(self):
+        result0 = zh.zero_fill_zarkov_result(
+            self.zarkov_data, 'month',
+            datetime(2010, 5, 1), datetime(2011, 9, 1))
+        result1 = zh.zero_fill_zarkov_result(
+            self.zarkov_data, 'month',
+            '2010-5-1', '2011-09-1')
+        self.assertEqual(result0, result1)

--- 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=q, limit=limit, sort=sort))}}" 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=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/mass_edit.html
+++ b/ForgeTracker/forgetracker/templates/tracker/mass_edit.html
@@ -13,7 +13,7 @@
 {% block header %}ForgeTracker for {{c.project.shortname}}{% endblock %}
 
 {% block actions %}
-    <a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=sort))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}} active"></b></a>
+    <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}} active"></b></a>
 {% endblock %}
 
 {% block edit_box %}

--- 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('edit/', dict(q=q, limit=limit, sort=sort))}}" 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=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/search.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search.html
@@ -13,7 +13,7 @@
 {% block actions %}
   <a href="{{tg.url(c.app.url+'search_feed/', dict(q=q, limit=limit, sort=sort))}}" title="Feed"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}"></b></a>
 {% if allow_edit and count != 0 %}
-  <a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=sort))}}" 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=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.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
@@ -1,5 +1,6 @@
 <div>
-  {% if tickets.__len__() %}
+  {% if tickets|length %}
+  {{widget.fields['page_size'].display(page=page, count=count, limit=limit)}}
     <table>
       <thead>
         <tr>
@@ -26,6 +27,8 @@
         {% endfor %}
       </tbody>
     </table>
+    {{widget.fields['lightbox'].display()}}
+    {{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}
     <script type="text/javascript">
       var q="{{query}}", count={{count}}, limit={{limit}}, page={{page}}, sort="{{sort}}";
     </script>

--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -1,7 +1,7 @@
 <form id="update-values">
     {% for field in globals.custom_fields %}
       {% if field.name == '_milestone' %}
-      <div class="grid-4">{{milestones}}
+      <div class="grid-6">{{milestones}}
         <label for="{{field.name}}" class="cr">{{field.label}}:</label>
         <select name="{{field.name}}" class="wide">
           <option value="" selected="selected">no change</option>
@@ -14,7 +14,7 @@
       </div>
       {% endif %}
     {% endfor %}
-    <div class="grid-4">
+    <div class="grid-6">
       <label for="status" class="cr">Status:</label>
       <select name="status" class="wide">
         <option value="" selected="selected">no change</option>
@@ -23,17 +23,17 @@
         {% endfor %}
       </select>
     </div>
-    <div class="grid-4">
+    <div class="grid-6">
       <label for="assigned_to" class="cr">Owner:</label>
       {{c.user_select.display(name='assigned_to', value='', className='wide')}}
     </div>
-    {% set cf_count = -1 %}
+    {% set cf_count = 0 %}
     {% for field in globals.custom_fields %}
       {% if field.type != 'sum' and field.name != '_milestone' %}
-        {% if cf_count%4 == 0 %}
+        {% if cf_count%3 == 0 %}
           <div style="clear: both"></div>
         {% endif %}
-        <div class="grid-4">
+        <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"/>
@@ -64,7 +64,7 @@
         {% set cf_count=cf_count+1 %}
       {% endif %}
     {% endfor %}
-    <div class="grid-16">
+    <div class="grid-18">
       <input type="button" onclick="update_tickets()" value="Save"/>
       <a href="{{cancel_href}}" class="btn link">Cancel</a>
       <!-- tg.url(c.app.url+'search/', dict(q=query, limit=limit, sort=sort))}}" class="btn link">Cancel</a>-->

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -382,7 +382,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 desc', **kw):
+    def index(self, limit=25, columns=None, page=0, sort='ticket_num_i asc', **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),
@@ -391,6 +391,7 @@ class RootController(BaseController):
         result['subscribed'] = M.Mailbox.subscribed()
         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
         c.ticket_search_results = W.ticket_search_results
         return result
 
@@ -584,7 +585,7 @@ class RootController(BaseController):
                    sort=validators.UnicodeString(if_empty='ticket_num_i asc')))
     def edit(self, q=None, limit=None, page=None, sort=None, **kw):
         require_access(c.app, 'write')
-        result = self.paged_query(q, sort=sort, **kw)
+        result = self.paged_query(q, sort=sort, limit=limit, page=page, **kw)
         # if c.app.globals.milestone_names is None:
         #     c.app.globals.milestone_names = ''
         result['globals'] = c.app.globals

--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -32,10 +32,10 @@ class TicketSearchResults(ew_core.SimpleForm):
         for r in super(TicketSearchResults, self).resources():
             yield r
 
-class MassEdit(ew_core.Widget):
+class MassEdit(ew_core.SimpleForm):
     template='jinja:forgetracker:templates/tracker_widgets/mass_edit.html'
     defaults=dict(
-        ew_core.Widget.defaults,
+        ew_core.SimpleForm.defaults,
         count=None,
         limit=None,
         query=None,
@@ -43,8 +43,16 @@ class MassEdit(ew_core.Widget):
         page=1,
         sort=None)
 
+    class fields(ew_core.NameList):
+        page_list=ffw.PageList()
+        page_size=ffw.PageSize()
+        lightbox=ffw.Lightbox(name='col_list',trigger='#col_menu')
+
     def resources(self):
         yield ew.JSLink('tracker_js/ticket-list.js')
+        yield ew.CSSLink('tracker_css/ticket-list.css')
+        for r in super(MassEdit, self).resources():
+            yield r
 
 class MassEditForm(ew_core.Widget):
     template='jinja:forgetracker:templates/tracker_widgets/mass_edit_form.html'

--- a/requirements.txt
+++ b/requirements.txt
@@ -9,10 +9,6 @@ phpserialize==1.2
 psycopg2==2.2.2
 sf.phpsession==0.1
 pyzmq==2.1.7
-Zarkov==0.1.0dev-20110815
-gevent==0.13.6
-greenlet==0.3.1
-gevent-zeromq==0.2.0
 Pygments==1.4sf1-20110601
 
 # for the migration scripts only