allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [16/17] allura git commit: [#7999] ticket:861 Change new projects js to work with new parameters format
Date Wed, 25 Nov 2015 19:38:10 GMT
[#7999] ticket:861 Change new projects js to work with new parameters format


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

Branch: refs/heads/master
Commit: f260d5f26fe9ccf58d7f969cfaa669cddbc70fcb
Parents: f32163c
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Wed Nov 18 15:59:10 2015 +0200
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Wed Nov 25 14:37:43 2015 -0500

----------------------------------------------------------------------
 Allura/allura/controllers/site_admin.py               | 2 +-
 Allura/allura/public/nf/js/site_admin_new_projects.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/f260d5f2/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 4776dd5..b6c0223 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -386,7 +386,7 @@ class DeleteProjectsController(object):
         projects = self.format_parsed_projects(parsed_projects)
         edit_link = u'./?projects={}&reason={}&disable_users={}'.format(
             h.urlquoteplus(projects),
-            h.urlquoteplus(reason),
+            h.urlquoteplus(reason or ''),
             h.urlquoteplus(disable_users))
         return {'projects': projects,
                 'parsed_projects': parsed_projects,

http://git-wip-us.apache.org/repos/asf/allura/blob/f260d5f2/Allura/allura/public/nf/js/site_admin_new_projects.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/site_admin_new_projects.js b/Allura/allura/public/nf/js/site_admin_new_projects.js
index 148e3de..302f4f7 100644
--- a/Allura/allura/public/nf/js/site_admin_new_projects.js
+++ b/Allura/allura/public/nf/js/site_admin_new_projects.js
@@ -24,7 +24,7 @@ $(document).ready(function() {
       urls.push($(val).attr('data-url'));
     });
     if (urls.length > 0) {
-      var url = '/nf/admin/delete_projects?projects=' + urls.join(' ');
+      var url = '/nf/admin/delete_projects/?projects=' + encodeURIComponent(urls.join('\n'));
       var url = $('<a>Delete selected projects</a>').attr('href', url);
       $('#delete-projects-url').html(url);
     } else {


Mime
View raw message