allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] 02/03: [#8375] fix neighborhood registration
Date Mon, 24 Aug 2020 21:22:05 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8375
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 896a6f83bedeb7a5513b7bd42200e3b39d36b195
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Mon Aug 24 16:07:44 2020 -0400

    [#8375] fix neighborhood registration
---
 Allura/allura/controllers/project.py                | 8 +++-----
 Allura/allura/tests/functional/test_neighborhood.py | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 77fea7e..5374a8c 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -212,11 +212,9 @@ class NeighborhoodController(object):
             require_access(self.neighborhood, 'admin')
         neighborhood = M.Neighborhood.query.get(name=neighborhood)
 
-        project_description = h.really_unicode(
-            project_description or '').encode('utf-8')
-        project_name = h.really_unicode(project_name or '').encode('utf-8')
-        project_unixname = h.really_unicode(
-            project_unixname or '').encode('utf-8').lower()
+        project_description = h.really_unicode(project_description or '')
+        project_name = h.really_unicode(project_name or '')
+        project_unixname = h.really_unicode(project_unixname or '').lower()
         try:
             c.project = neighborhood.register_project(project_unixname,
                                                       project_name=project_name, private_project=private_project)
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index 8755336..33b0ba6 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -864,6 +864,7 @@ class TestNeighborhood(TestController):
                           extra_environ=dict(username=str('root')))
         assert r.status_int == 302, r.html.find(
             'div', {'class': 'error'}).string
+        assert not r.location.endswith('/add_project'), self.webflash(r)
         r = self.app.get('/adobe/test/wiki/').follow(status=200)
 
     def test_neighborhood_awards(self):


Mime
View raw message