From 332d7a52ec56c2ed1af736a8026651c8ce84a499 Mon Sep 17 00:00:00 2001
From: netwolfuk <netwolfuk@gmail.com>
Date: Sat, 31 Oct 2015 23:50:18 +1300
Subject: [PATCH] Add reason for not displaying _Root webhooks for non-admin
 users in Webhooks Project Tab. Fixes issue #11. Removed buildWebHookTab.jsp
 as it was no longer used. Renamed projectWebHookTab.jsp webHookTab.jsp since
 it is now used for Build and Project tab pages.

---
 .../extension/WebHookBuildTabExtension.java   |  3 +-
 .../extension/WebHookProjectTabExtension.java | 10 +++-
 .../WebHook/buildWebHookTab.jsp               | 53 -------------------
 .../{projectWebHookTab.jsp => webHookTab.jsp} |  4 +-
 4 files changed, 13 insertions(+), 57 deletions(-)
 delete mode 100644 tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/buildWebHookTab.jsp
 rename tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/{projectWebHookTab.jsp => webHookTab.jsp} (91%)

diff --git a/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookBuildTabExtension.java b/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookBuildTabExtension.java
index c04a2832..edc8875f 100644
--- a/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookBuildTabExtension.java
+++ b/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookBuildTabExtension.java
@@ -113,8 +113,7 @@ protected void fillModel(Map model, HttpServletRequest request,
 
 	@Override
 	public String getIncludeUrl() {
-		//return myPluginPath + "WebHook/buildWebHookTab.jsp";
-		return myPluginPath + "WebHook/projectWebHookTab.jsp";
+		return myPluginPath + "WebHook/webHookTab.jsp";
 	}
 
 
diff --git a/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookProjectTabExtension.java b/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookProjectTabExtension.java
index 022ee2ff..a32bae1f 100644
--- a/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookProjectTabExtension.java
+++ b/tcwebhooks-web-ui/src/main/java/webhook/teamcity/extension/WebHookProjectTabExtension.java
@@ -50,8 +50,14 @@ protected void fillModel(Map model, HttpServletRequest request,
 		
 		List<ProjectAndBuildWebhooksBean> projectAndParents = new ArrayList<ProjectAndBuildWebhooksBean>();  
 		List<SProject> parentProjects = project.getProjectPath();
+		
+		model.put("permissionError", "");
+		
 		if (!user.getGlobalPermissions().contains(Permission.CHANGE_SERVER_SETTINGS)){
 			parentProjects.remove(0);
+			if (project.getProjectId().equals("_Root")){
+				model.put("permissionError", "<strong>You do not have permission to view WebHooks for the <em>_Root</em> project. Please contact your TeamCity Administrator</strong>");
+			}
 		}
 		for (SProject projectParent : parentProjects){
 			projectAndParents.add(
@@ -73,6 +79,8 @@ protected void fillModel(Map model, HttpServletRequest request,
 
 		model.put("projectAndParents", projectAndParents);
 		
+		
+		
 //    	model.put("projectWebHookCount", projectWebhooks.size());
 //    	if (projectWebhooks.size() == 0){
 //    		model.put("noProjectWebHooks", "true");
@@ -93,7 +101,7 @@ protected void fillModel(Map model, HttpServletRequest request,
 
 	@Override
 	public String getIncludeUrl() {
-		return myPluginPath+ "WebHook/projectWebHookTab.jsp";
+		return myPluginPath+ "WebHook/webHookTab.jsp";
 	}
 
 }
diff --git a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/buildWebHookTab.jsp b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/buildWebHookTab.jsp
deleted file mode 100644
index f7b10fe9..00000000
--- a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/buildWebHookTab.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ include file="/include.jsp" %>
-	<div><h3 class="title">WebHooks configured for ${projectName}</h3>
-	
-<c:if test="${noProjectWebHooks}" >
-		<div style='margin-left: 1em; margin-right:1em;'>
-		<p>There are no WebHooks configured for this project.</p> 
-		<a href="./webhooks/index.html?projectId=${projectExternalId}">Add project WebHooks</a>.
-		</div>
-	</div>
-</c:if>
-<c:if test="${projectWebHooks}" >
-		<div style='margin-left: 1em; margin-right:1em;'>
-		<c:if test="${projectWebHooksDisabled}" >
-			<div><strong>WARNING: Webhook processing is currently disabled for this project</strong></div>
-		</c:if>
-		<p>There are <strong>${projectWebHookCount}</strong> WebHooks configured for all builds in this project. 
-			<a href="./webhooks/index.html?projectId=${projectExternalId}">Edit project WebHooks</a>.</p>
-		<table class="testList dark borderBottom">
-			<thead><tr><th class=name>URL</th><th class=name>Enabled</th></tr></thead>
-			<tbody>
-			<c:forEach items="${projectWebHookList}" var="hook">
-				<tr><td><c:out value="${hook.url}" /></td><td><c:out value="${hook.enabledListAsString}" /></td></tr>  
-			</c:forEach>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</c:if>
-
-<div style='margin-top: 2.5em;'><h3 class="title">WebHooks configured for ${projectName} &gt; ${buildName}</h3>
-
-<c:if test="${noBuildWebHooks}" >
-		<div style='margin-left: 1em; margin-right:1em;'>
-		<p>There are no WebHooks configured for this specific build.</p> 
-		<a href="./webhooks/index.html?buildTypeId=${buildExternalId}">Add build WebHooks</a>.
-		</div>
-	</div>
-</c:if>
-<c:if test="${buildWebHooks}" >
-		<div style='margin-left: 1em; margin-right:1em;'>
-		<p>There are <strong>${buildWebHookCount}</strong> WebHooks for this specific build. 
-			<a href="./webhooks/index.html?buildTypeId=${buildExternalId}">Edit build WebHooks</a>.</p>
-		<table class="testList dark borderBottom">
-			<thead><tr><th class=name>URL</th><th class=name>Enabled</th></tr></thead>
-			<tbody>
-			<c:forEach items="${buildWebHookList}" var="hook">
-				<tr><td><c:out value="${hook.url}" /></td><td><c:out value="${hook.enabledListAsString}" /></td></tr>  
-			</c:forEach>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</c:if>
\ No newline at end of file
diff --git a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/projectWebHookTab.jsp b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/webHookTab.jsp
similarity index 91%
rename from tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/projectWebHookTab.jsp
rename to tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/webHookTab.jsp
index 81d79739..f12060a7 100644
--- a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/projectWebHookTab.jsp
+++ b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/webHookTab.jsp
@@ -1,6 +1,8 @@
 <%@ include file="/include.jsp" %>
 	<div>
 	
+	${permissionError}
+	
 	<c:forEach items="${projectAndParents}" var="project">
 		<div style="background-color: #f5f5f5; padding: 5px; margin:0.75em;  margin-top:3em;">
 		<c:choose>
@@ -39,7 +41,7 @@
 
 			<c:forEach items="${project.buildWebhooks}" var="config">
 
-				<div style='margin-top: 2.5em;'><h3 class="title">WebHooks configured for ${projectName} &gt; ${config.buildName}</h3>
+				<div style='margin-top: 2.5em;'><h3 class="title" style="background-color: #f5f5f5; border-bottom: solid 2px #ABB1C4;">WebHooks configured for ${projectName} &gt; ${config.buildName}</h3>
 				
 				<c:if test="${config.hasNoBuildWebHooks}" >
 						<div style='margin-left: 1em; margin-right:1em;'>