From 5ef23e32c2abcfe7e38c40183cc14fd11ac10d85 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 31 Jan 2022 12:35:15 +0545
Subject: [PATCH] switch default permission to bucket level

---
 app/views/console/storage/bucket.phtml | 22 +++++++++++-----------
 app/views/console/storage/index.phtml  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/console/storage/bucket.phtml b/app/views/console/storage/bucket.phtml
index 274d81818e..5445b3c56d 100644
--- a/app/views/console/storage/bucket.phtml
+++ b/app/views/console/storage/bucket.phtml
@@ -423,17 +423,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                 <hr class="margin-top-small" />
 
                                 <div class="row">
-                                    <div class="col span-1"><input name="permission" value="file" type="radio" class="margin-top-no" data-ls-bind="{{project-bucket.permission}}" /></div>
-                                    <div class="col span-11">
-                                        <b>File Level</b>
-                                        <p class="text-fade margin-top-tiny">With File Level permissions, you have granular access control over every file. Users will only be able to access files for which they have explicit permissions.</p>
-                                        <p class="text-fade margin-top-tiny">In this permission level file permissions take precedence and bucket permissions are ignored.</p>
-                                    </div>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col span-1"><input name="permission" value="bucket" type="radio" class="margin-top-tiny" data-ls-bind="{{project-bucket.permission}}" /></div>
-                                    <div class="col span-11">
+                                    <div class="col span-2"><input name="permission" value="bucket" type="radio" class="margin-top-tiny" data-ls-bind="{{project-bucket.permission}}" /></div>
+                                    <div class="col span-12">
                                         <b>Bucket Level</b>
                                         <p class="text-fade margin-top-tiny">With Bucket Level permissions, you assign permissions only once in the bucket.</p>
                                         <p class="text-fade margin-top-tiny">In this permission level permissions assigned to bucket takes the precedence and file permissions are ignored</p>
@@ -450,6 +441,15 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                     </div>
                                 </div>
 
+                                <div class="row">
+                                    <div class="col span-1"><input name="permission" value="file" type="radio" class="margin-top-no" data-ls-bind="{{project-bucket.permission}}" /></div>
+                                    <div class="col span-11">
+                                        <b>File Level</b>
+                                        <p class="text-fade margin-top-tiny">With File Level permissions, you have granular access control over every file. Users will only be able to access files for which they have explicit permissions.</p>
+                                        <p class="text-fade margin-top-tiny">In this permission level file permissions take precedence and bucket permissions are ignored.</p>
+                                    </div>
+                                </div>
+
                                 <hr class="margin-top-no" />
 
                                 <button>Update</button>
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index 41b6bfde27..654b9318ab 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -109,7 +109,7 @@
                         <label for="bucket-name">Name</label>
                         <input type="text" class="full-width" id="bucket-name" name="name" required autocomplete="off" maxlength="128" />
 
-                        <input type="hidden" id="bucket-permission" name="permission" required value="file" />
+                        <input type="hidden" id="bucket-permission" name="permission" required value="bucket" />
                         <input type="hidden" id="bucket-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="bucket-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />