Merge pull request #6 from ikedam/feature/JENKINS-20786_RadioToDropdown

[JENKINS-20786] switched hetero-radio to dropdownDescriptorSelector
jenkinsci · Apr 13, 2014 · 8672e86 · 8672e86
2 parents 2374674 + df37db6
commit 8672e86
Show file tree

Hide file tree

Showing 8 changed files with 181 additions and 4 deletions.
diff --git a/...in/resources/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/config.jelly b/...in/resources/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/config.jelly
@@ -23,9 +23,8 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:adjunct includes="org.jenkinsci.plugins.authorizeproject.nestedHelp"/>
   <f:optionalBlock name="${descriptor.propertyName}" title="${descriptor.displayName}" checked="${instance != null}">
-    <f:entry title="${%Authorize Strategy}" field="strategy">
-      <f:hetero-radio field="strategy" descriptors="${descriptor.strategyList}" />
-    </f:entry>
+    <f:dropdownDescriptorSelector title="${%Authorize Strategy}" field="strategy" descriptors="${descriptor.strategyList}" />
   </f:optionalBlock>
 </j:jelly>
diff --git a/...rces/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategy.groovy b/...rces/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategy.groovy
@@ -0,0 +1,65 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2014 IKEDA Yasuyuki
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.authorizeproject;
+
+import jenkins.model.Jenkins;
+
+st = namespace("jelly:stapler");
+
+def descriptor = Jenkins.instance.getDescriptorOrDie(AuthorizeProjectProperty.class);
+
+def myselfName = descriptor.plugin.shortName;
+
+// help file for strategy itself.
+def strategyRawHelpFile = descriptor.getHelpFile("strategyRaw");
+
+if (strategyRawHelpFile != null) {
+  div(
+      class: "authorize-project-nested-help",
+      helpURL: String.format("%s%s", rootURL, strategyRawHelpFile),
+      myselfName: myselfName,
+  ) {
+    text("Loading...");
+  }
+}
+
+dl() {
+  descriptor.strategyList.each() { d ->
+    def helpFile = d.getHelpFile();
+    dt(d.displayName);
+    if (helpFile != null) {
+      dd(
+          class: "authorize-project-nested-help",
+          helpURL: String.format("%s%s", rootURL, helpFile),
+          myselfName: myselfName,
+      ) {
+        text("Loading...");
+      }
+    } else {
+      dd("No help available.");
+    }
+  }
+}
+
diff --git a/...ces/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategyRaw.html b/...ces/org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategyRaw.html
@@ -0,0 +1,3 @@
+<div>
+Select one of following strategies:
+</div>
diff --git a/.../org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategyRaw_ja.html b/.../org/jenkinsci/plugins/authorizeproject/AuthorizeProjectProperty/help-strategyRaw_ja.html
@@ -0,0 +1,3 @@
+<div>
+以下の設定方法が利用可能です。
+</div>
diff --git a/src/main/resources/org/jenkinsci/plugins/authorizeproject/nestedHelp.js b/src/main/resources/org/jenkinsci/plugins/authorizeproject/nestedHelp.js
@@ -0,0 +1,53 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2014 IKEDA Yasuyuki
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+Behaviour.register({".authorize-project-nested-help": function(e) {
+  // ensure Behavior is applied only once.
+  $(e).removeClassName("authorize-project-nested-help");
+  new Ajax.Request(e.getAttribute("helpURL"), {
+    method : 'get',
+    onSuccess : function(x) {
+      e.innerHTML = x.responseText;
+      var myselfName = e.getAttribute("myselfName");
+      var pluginName = x.getResponseHeader("X-Plugin-Short-Name");
+      if (myselfName != pluginName) {
+        var from = x.getResponseHeader("X-Plugin-From");
+        if (from) {
+          e.innerHTML += "<div class='from-plugin'>"+from+"</div>";
+        }
+      }
+      layoutUpdateCallback.call();
+    },
+    onFailure : function(x) {
+      e.innerHTML = "<b>ERROR</b>: Failed to load help file: " + x.statusText;
+    }
+  });
+}});
+
+/**
+ * Allows run Behavior when help is loaded.
+ */
+layoutUpdateCallback.add(function() {
+  $$(".authorize-project-nested-help").each(function(e){Behaviour.applySubtree(e, true)});
+});
+
diff --git a/...g/jenkinsci/plugins/authorizeproject/strategy/AnonymousAuthorizationStrategy/config.jelly b/...g/jenkinsci/plugins/authorizeproject/strategy/AnonymousAuthorizationStrategy/config.jelly
@@ -0,0 +1,27 @@
+<!--
+The MIT License
+
+Copyright (c) 2014 IKEDA Yasuyuki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <!-- dropdownDescriptorSelector causes exception without config.jelly -->
+</j:jelly>
diff --git a/...ns/authorizeproject/strategy/SpecificUsersAuthorizationStrategy/checkPasswordRequested.js b/...ns/authorizeproject/strategy/SpecificUsersAuthorizationStrategy/checkPasswordRequested.js
@@ -64,7 +64,7 @@ Behaviour.specify(".specific-user-authorization", "checkPasswordRequired", 0, fu
     var url = useridField.getAttribute("checkPasswordRequestedUrl");
     url = eval(url);
     var ajax = new Ajax.Request(url, {
-      evalJS: false, // evaluate contents.
+      evalJS: false, // don't evaluate contents automatically.
       onSuccess: function(response) {
         var required = eval(response.responseText);
         if (required) {

diff --git a/...insci/plugins/authorizeproject/strategy/TriggeringUsersAuthorizationStrategy/config.jelly b/...insci/plugins/authorizeproject/strategy/TriggeringUsersAuthorizationStrategy/config.jelly
@@ -0,0 +1,27 @@
+<!--
+The MIT License
+
+Copyright (c) 2013 IKEDA Yasuyuki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <!-- dropdownDescriptorSelector causes exception without config.jelly -->
+</j:jelly>