Do not offer impossible Cloud options to users with SystemRead (#8943)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
jenkinsci · Feb 9, 2024 · d5c9e6a · d5c9e6a
1 parent e05ffb8
commit d5c9e6a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index.jelly b/core/src/main/resources/jenkins/agents/CloudSet/index.jelly
@@ -93,33 +93,42 @@ THE SOFTWARE.
             <section class="empty-state-section">
               <j:choose>
                 <j:when test="${it.cloudAvailable}">
-                  <p>${%noCloudAvailable}</p>
+                  <j:choose>
+                    <j:when test="${h.hasPermission(app.ADMINISTER)}">
+                      <p>${%noCloudAvailableCTA}</p>
+                    </j:when>
+                    <j:otherwise>
+                      <p>${%noCloudAvailable}</p>
+                    </j:otherwise>
+                  </j:choose>
                 </j:when>
                 <j:otherwise>
                   <p>${%noCloudPlugin}</p>
                 </j:otherwise>
               </j:choose>
               <ul class="empty-state-section-list">
-                <j:if test="${it.cloudAvailable}">
+                <l:isAdmin>
+                  <j:if test="${it.cloudAvailable}">
+                    <li class="content-block">
+                      <a href="new"
+                         class="content-block__link">
+                        <span>${%newCloud}</span>
+                        <span class="trailing-icon">
+                          <l:icon src="symbol-add"/>
+                        </span>
+                      </a>
+                    </li>
+                  </j:if>
                   <li class="content-block">
-                    <a href="new"
+                    <a href="${rootURL}/manage/pluginManager/available?filter=${it.cloudUpdateCenterCategoryLabel}"
                        class="content-block__link">
-                      <span>${%newCloud}</span>
+                      <span>${%installCloudPlugin}</span>
                       <span class="trailing-icon">
-                        <l:icon src="symbol-add"/>
+                        <l:icon src="symbol-plugins" />
                       </span>
                     </a>
                   </li>
-                </j:if>
-                <li class="content-block">
-                  <a href="${rootURL}/manage/pluginManager/available?filter=${it.cloudUpdateCenterCategoryLabel}"
-                     class="content-block__link">
-                    <span>${%installCloudPlugin}</span>
-                    <span class="trailing-icon">
-                      <l:icon src="symbol-plugins" />
-                    </span>
-                  </a>
-                </li>
+                </l:isAdmin>
                 <li class="content-block">
                   <a href="https://www.jenkins.io/redirect/distributed-builds"
                      class="content-block__link"

diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index.properties b/core/src/main/resources/jenkins/agents/CloudSet/index.properties
@@ -1,5 +1,6 @@
 learnMoreDistributedBuilds=Learn more about distributed builds
-noCloudAvailable=There are no clouds currently setup, create one or install a plugin for more cloud options.
+noCloudAvailableCTA=There are no clouds currently set up. Create one, or install a plugin for more cloud options.
+noCloudAvailable=There are no clouds currently set up.
 noCloudPlugin=There is no plugin installed that supports clouds.
 newCloud=New cloud
 installCloudPlugin=Install a plugin

diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index_fr.properties b/core/src/main/resources/jenkins/agents/CloudSet/index_fr.properties
@@ -1,5 +1,5 @@
 learnMoreDistributedBuilds=En apprendre plus à propos des builds distribués
-noCloudAvailable=Aucune configuration de cloud, créez-en une ou installez un plugin pour plus d''options de cloud.
+noCloudAvailableCTA=Aucune configuration de cloud, créez-en une ou installez un plugin pour plus d''options de cloud.
 noCloudPlugin=Aucun plugin installé supportant les clouds.
 newCloud=Nouveau cloud
 installCloudPlugin=Installer un plugin
diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index_tr.properties b/core/src/main/resources/jenkins/agents/CloudSet/index_tr.properties
@@ -1,6 +1,6 @@
 Clouds=Bulutlar
 learnMoreDistributedBuilds=Dağıtık yapılandırmalar hakkında daha fazla bilgi edinin
-noCloudAvailable=Şu anda kurulu bulut yok, bir tane oluşturun veya daha fazla bulut seçeneği için bir eklenti yükleyin.
+noCloudAvailableCTA=Şu anda kurulu bulut yok, bir tane oluşturun veya daha fazla bulut seçeneği için bir eklenti yükleyin.
 noCloudPlugin=İsteğe bağlı olarak ajan hazırlamak için kullanılmak üzere herhangi bir bulut yüklü değil.
 newCloud=Yeni bulut
 installCloudPlugin=Bir eklenti yükleyin