[allura] branch kt/4069 updated: fixup! fixup! [#4069] Disallow removal of anon read access from projects when nbhd prevents private projects

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch kt/4069
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/kt/4069 by this push:
     new a3d3f4e  fixup! fixup! [#4069] Disallow removal of anon read access from projects when nbhd prevents private projects
a3d3f4e is described below

commit a3d3f4e61c8ebf3596caff827c1aba2492ac9eff
Author: Kenton Taylor <kt...@slashdotmedia.com>
AuthorDate: Fri Sep 18 13:16:33 2020 +0000

    fixup! fixup! [#4069] Disallow removal of anon read access from projects when nbhd prevents private projects
---
 Allura/allura/ext/admin/templates/project_groups.html | 2 +-
 Allura/allura/public/nf/js/project_groups.js          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index 6a9e269..9796b7b 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -118,7 +118,7 @@
 
 {% block extra_js %}
 <script type="text/javascript">
-  window.SF.privateProjectsAllowed = {{ 'true' if private_projects else 'false' }};
+  privateProjectsAllowed = {{ 'true' if private_projects else 'false' }};
 
   // these icons are used in the js, so set them up now
   var spinner_img = '<img src="{{g.forge_static('images/spinner.gif')}}">';
diff --git a/Allura/allura/public/nf/js/project_groups.js b/Allura/allura/public/nf/js/project_groups.js
index 7d84a20..fe16a1e 100644
--- a/Allura/allura/public/nf/js/project_groups.js
+++ b/Allura/allura/public/nf/js/project_groups.js
@@ -16,7 +16,7 @@
        specific language governing permissions and limitations
        under the License.
 */
-/*global SF, $ */
+/*global privateProjectsAllowed */
 
 $(function() {
   var cval = $.cookie('_session_id');
@@ -90,13 +90,13 @@ $(function() {
           perm_link.attr('title',item.text);
           if(item.has=="yes"){
             perm_icon.attr('class','fa fa-check');
-            if (!SF.privateProjectsAllowed) {
+            if (!privateProjectsAllowed) {
               perm_holder.hide();
             }
           }
           else if(item.has=="inherit"){
             perm_icon.attr('class','fa fa-check-circle');
-            if(!SF.privateProjectsAllowed){
+            if(!privateProjectsAllowed){
               perm_holder.hide();
             }
           }