提交: ef2c68a86dab644564425a422915c653a277c70d - allura (git)

allura

Commit MetaInfo

• 修訂: ef2c68a86dab644564425a422915c653a277c70d (tree)
• 時間: 2012-07-16 21:26:53
• 作者: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4410] ticket:115 Fix browsing folders named like *.file_extension

Change Summary

• modified: Allura/allura/controllers/repository.py
• modified: requirements-common.txt
• modified: requirements-sf.txt

差異

--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -444,6 +444,12 @@ class TreeBrowser(BaseController):
 
     @expose()
     def _lookup(self, next, *rest):
+        if not rest and request.response_ext:
+            # Directory name may ends with file extension (e.g. `dir.rdf`)
+            # dispatching system will cut extension, so we need to restore it
+            next = "%s%s" % (next, request.response_ext)
+            request.response_ext = None
+            request.response_type = None
         next=unquote(next)
         if not rest:
             # Might be a file rather than a dir

--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -73,3 +73,6 @@ nose==1.1.2
 pyflakes==0.5.0
 WebTest==1.3.1
 clonedigger==1.1.0
+
+SQLAlchemy==0.7.2
+sqlalchemy-migrate==0.7.1

--- a/requirements-sf.txt
+++ b/requirements-sf.txt
@@ -9,8 +9,6 @@ MySQL-python==1.2.3c1
 phpserialize==1.2
 psycopg2==2.2.2
 sf.phpsession==0.1
-SQLAlchemy==0.7.2
-sqlalchemy-migrate==0.7.1
 pyzmq==2.1.7
 
 # for the migration scripts only