You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/09/25 04:13:10 UTC

[11/14] git commit: [#4637] ticket:146 fixed: pyflakes, date

[#4637] ticket:146 fixed: pyflakes, date


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/81be3eee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/81be3eee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/81be3eee

Branch: refs/heads/master
Commit: 81be3eee94a0d026f4297aae97367005ad7b8199
Parents: 31f5f3f
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed Sep 5 17:06:43 2012 +0400
Committer: Cory Johns <jo...@geek.net>
Committed: Fri Sep 21 20:06:16 2012 +0000

----------------------------------------------------------------------
 ForgeShortUrl/forgeshorturl/templates/index.html   |    4 ++--
 .../forgeshorturl/tests/functional/test.py         |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/81be3eee/ForgeShortUrl/forgeshorturl/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/index.html b/ForgeShortUrl/forgeshorturl/templates/index.html
index 5bf36fb..435089b 100644
--- a/ForgeShortUrl/forgeshorturl/templates/index.html
+++ b/ForgeShortUrl/forgeshorturl/templates/index.html
@@ -31,8 +31,8 @@
         <td><small><a href="{{ c.app.url+su.short_name }}">{{ request.scheme+'://'+request.host+c.app.url+su.short_name}}</a></small></td>
         <td><small>{{ su.url|urlize(20) }}</small></td>
         <td><small>{{ su.description }}</small></td>
-        <td><small>{{ su.created }}</small></td>
-        <td><small>{{ su.last_updated }}</small></td>
+        <td><small>{{ lib.abbr_date(su.created) }}</small></td>
+        <td><small>{{ lib.abbr_date(su.last_updated) }}</small></td>
 
     </tr>
     {% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/81be3eee/ForgeShortUrl/forgeshorturl/tests/functional/test.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/tests/functional/test.py b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
index b143ed6..466845f 100644
--- a/ForgeShortUrl/forgeshorturl/tests/functional/test.py
+++ b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
@@ -29,10 +29,6 @@ class TestRootController(TestController):
         assert 'http://www.google.com/' in r
 
     def test_shorturl_private(self):
-        d = dict(short_url='test_private',
-                 full_url='http://www.amazone.com/',
-                 private='on',
-                 description="description1")
         self.app.post('/admin/url/add',
                       dict(short_url='test_private',
                            full_url='http://www.amazone.com/',