we need hasAbortPermission has well.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6585 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/AbstractProject.java

@@ -511,6 +511,10 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
         checkPermission(AbstractProject.ABORT);
     }
 
+    public boolean hasAbortPermission() {
+        return hasPermission(AbstractProject.ABORT);
+    }
+
     /**
      * Gets the {@link Resource} that represents the workspace of this project.
      */

core/src/main/java/hudson/model/Executor.java

@@ -167,12 +167,7 @@ public class Executor extends Thread implements ModelObject {
      * Checks if the current user has a permission to stop this build. 
      */
     public boolean hasStopPermission() {
-        try {
-            executable.getParent().checkAbortPermission();
-            return true;
-        } catch (AccessDeniedException e) {
-            return false;
-        }
+        return executable.getParent().hasAbortPermission();
     }
 
     public Computer getOwner() {

core/src/main/java/hudson/model/Queue.java

@@ -587,6 +587,12 @@ public class Queue extends ResourceController {
          * @throws AccessDeniedException if the permission is not granted.
          */
         void checkAbortPermission();
+
+        /**
+         * Works just like {@link #checkAbortPermission()} except it indicates the status by a return value,
+         * instead of exception.
+         */
+        boolean hasAbortPermission();
     }
 
     public interface Executable extends Runnable {
@@ -694,12 +700,7 @@ public class Queue extends ResourceController {
         }
 
         public boolean hasCancelPermission() {
-            try {
-                task.checkAbortPermission();
-                return true;
-            } catch (AccessDeniedException e) {
-                return false;
-            }
+            return task.hasAbortPermission();
         }
 
         public int compareTo(Item that) {

core/src/main/resources/lib/hudson/buildCaption.jelly

@@ -11,9 +11,9 @@
 	        </td><td>
 	          <t:buildProgressBar build="${it}"/>
 	        </td><td>
-            <l:isAdmin>
-	            <a href="stop"><img src="${imagesURL}/16x16/stop.gif" alt="[${%cancel}]" /></a>
-            </l:isAdmin>
+            <j:if test="${parent.}">
+              <a href="stop"><img src="${imagesURL}/16x16/stop.gif" alt="[${%cancel}]" /></a>
+            </j:if>
 	        </td>
 	      </tr></table>
 	    </div>