Merge pull request #155 from 2m0nd/master

marvin-w · web-flow · commit 6bbcf5dce461 · 2018-05-14T15:54:12.000+02:00
Add "Who triggered build" info, add settings enable/disable this info
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
         <teamcity-version>9.1.7</teamcity-version>
         <majorVersion>1</majorVersion>
         <minorVersion>4</minorVersion>
-        <patchVersion>6</patchVersion>
+        <patchVersion>7</patchVersion>
         <currentVersion>${majorVersion}.${minorVersion}.${patchVersion}</currentVersion>
     </properties>
     <version>${currentVersion}</version>
@@ -43,6 +43,19 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                <execution>
+                    <id>auto-clean</id>
+                    <phase>initialize</phase>
+                    <goals>
+                    <goal>clean</goal>
+                    </goals>
+                </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/SlackNotification.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/SlackNotification.java
@@ -102,6 +102,8 @@ public interface SlackNotification {
     public abstract void setShowCommits(boolean showCommits);
 	
     public abstract void setShowCommitters(boolean showCommitters);
+	
+	public abstract void setShowTriggeredBy(boolean showTriggeredBy);
 
     public abstract void setMaxCommitsToDisplay(int maxCommitsToDisplay);
 
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/SlackNotificationImpl.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/SlackNotificationImpl.java
@@ -65,6 +65,7 @@ public class SlackNotificationImpl implements SlackNotification {
     private Boolean showElapsedBuildTime;
     private boolean showCommits;
     private boolean showCommitters;
+    private boolean showTriggeredBy;
     private int maxCommitsToDisplay;
     private boolean mentionChannelEnabled;
     private boolean mentionSlackUserEnabled;
@@ -347,6 +348,10 @@ private List<Attachment> getAttachments() {
                 attachment.addField("Changes By", committersString, false);
             }
         }
+        
+        if (showTriggeredBy){
+            attachment.addField("Triggered By", this.payload.getTriggeredBy(), false);
+        }
 
         // Mention the channel and/or the Slack Username of any committers if known
         if(payload.getIsFirstFailedBuild()
@@ -635,6 +640,11 @@ public void setShowCommitters(boolean showCommitters) {
         this.showCommitters = showCommitters;
     }
 
+    @Override
+    public void setShowTriggeredBy(boolean showTriggeredBy) {
+        this.showTriggeredBy = showTriggeredBy;
+    }
+
     @Override
     public void setMaxCommitsToDisplay(int maxCommitsToDisplay) {
         this.maxCommitsToDisplay = maxCommitsToDisplay;
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/SlackNotificationListener.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/SlackNotificationListener.java
@@ -76,6 +76,7 @@ public void getFromConfig(SlackNotification slackNotification, SlackNotification
         slackNotification.setShowElapsedBuildTime(myMainSettings.getShowElapsedBuildTime());
         slackNotification.setShowCommits(myMainSettings.getShowCommits());
         slackNotification.setShowCommitters(myMainSettings.getShowCommitters());
+        slackNotification.setShowTriggeredBy(myMainSettings.getShowTriggeredBy());
         slackNotification.setShowFailureReason(myMainSettings.getShowFailureReason() == null ? SlackNotificationContentConfig.DEFAULT_SHOW_FAILURE_REASON : myMainSettings.getShowFailureReason());
         slackNotification.setMaxCommitsToDisplay(myMainSettings.getMaxCommitsToDisplay());
         slackNotification.setMentionChannelEnabled(slackNotificationConfig.getMentionChannelEnabled());
@@ -90,6 +91,7 @@ public void getFromConfig(SlackNotification slackNotification, SlackNotification
             slackNotification.setShowElapsedBuildTime(slackNotificationConfig.getContent().getShowElapsedBuildTime());
             slackNotification.setShowCommits(slackNotificationConfig.getContent().getShowCommits());
             slackNotification.setShowCommitters(slackNotificationConfig.getContent().getShowCommitters());
+            slackNotification.setShowTriggeredBy(slackNotificationConfig.getContent().getShowTriggeredBy());
             slackNotification.setShowFailureReason(slackNotificationConfig.getContent().getShowFailureReason() == null ? SlackNotificationContentConfig.DEFAULT_SHOW_FAILURE_REASON : slackNotificationConfig.getContent().getShowFailureReason());
         }
 		Loggers.ACTIVITIES.debug("SlackNotificationListener :: SlackNotification proxy set to "
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/payload/content/SlackNotificationPayloadContent.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/payload/content/SlackNotificationPayloadContent.java
@@ -198,6 +198,7 @@ private void populateCommonContent(SBuildServer server, SRunningBuild sRunningBu
         setBuildResult(sRunningBuild, previousBuild, buildState);
         setBuildFullName(sRunningBuild.getBuildType().getFullName());
         setBuildName(sRunningBuild.getBuildType().getName());
+        setTriggeredBy(sRunningBuild.getTriggeredBy().getAsString());
         setBuildId(Long.toString(sRunningBuild.getBuildId()));
         setBuildTypeId(TeamCityIdResolver.getBuildTypeId(sRunningBuild.getBuildType()));
         setAgentName(sRunningBuild.getAgentName());
@@ -329,6 +330,14 @@ public void setBuildName(String buildName) {
 			this.buildName = buildName;
 		}
 
+		public String getTriggeredBy() {
+			return triggeredBy;
+		}
+
+		public void setTriggeredBy(String triggeredBy) {
+			this.triggeredBy = triggeredBy;
+		}
+        
 		public String getBuildId() {
 			return buildId;
 		}
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationConfig.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationConfig.java
@@ -34,6 +34,7 @@ public class SlackNotificationConfig {
 	private static final String SHOW_BUILD_AGENT = "showBuildAgent";
 	private static final String SHOW_COMMITS = "showCommits";
 	private static final String SHOW_COMMITTERS = "showCommitters";
+	private static final String SHOW_TRIGGERED_BY = "showTriggeredBy";
 	private static final String MAX_COMMITS_TO_DISPLAY = "maxCommitsToDisplay";
 	private static final String SHOW_FAILURE_REASON = "showFailureReason";
 	
@@ -180,6 +181,9 @@ public SlackNotificationConfig(Element e) {
             }
             if (eContent.getAttribute(SHOW_COMMITTERS) != null){
                 this.content.setShowCommitters(Boolean.parseBoolean(eContent.getAttributeValue(SHOW_COMMITTERS)));
+            }
+			if (eContent.getAttribute(SHOW_TRIGGERED_BY) != null){
+                this.content.setShowTriggeredBy(Boolean.parseBoolean(eContent.getAttributeValue(SHOW_TRIGGERED_BY)));
             }
             if (eContent.getAttribute(MAX_COMMITS_TO_DISPLAY) != null){
                 this.content.setMaxCommitsToDisplay(Integer.parseInt(eContent.getAttributeValue(MAX_COMMITS_TO_DISPLAY)));
@@ -288,6 +292,7 @@ public Element getAsElement(){
             customContentEl.setAttribute("showElapsedBuildTime", this.content.getShowElapsedBuildTime().toString());
             customContentEl.setAttribute(SHOW_COMMITS, this.content.getShowCommits().toString());
             customContentEl.setAttribute(SHOW_COMMITTERS, this.content.getShowCommitters().toString());
+            customContentEl.setAttribute(SHOW_TRIGGERED_BY, this.content.getShowTriggeredBy().toString());
             customContentEl.setAttribute(SHOW_FAILURE_REASON, this.content.getShowFailureReason().toString());
             el.addContent(customContentEl);
         }
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationContentConfig.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationContentConfig.java
@@ -9,13 +9,15 @@ public class SlackNotificationContentConfig {
     public static final boolean DEFAULT_SHOW_ELAPSED_BUILD_TIME = true;
     public static final boolean DEFAULT_SHOW_COMMITS = true;
     public static final boolean DEFAULT_SHOW_COMMITTERS = true;
+    public static final boolean DEFAULT_SHOW_TRIGGERED_BY = true;
     public static final boolean DEFAULT_SHOW_FAILURE_REASON = false;
     private String iconUrl = SlackNotificationMainConfig.DEFAULT_ICONURL;
     private String botName = SlackNotificationMainConfig.DEFAULT_BOTNAME;
     private Boolean showBuildAgent;
     private Boolean showElapsedBuildTime;
     private Boolean showCommits = true;
     private Boolean showCommitters = true;
+    private Boolean showTriggeredBy = true;
     private int maxCommitsToDisplay = 5;
     private boolean enabled;
     private Boolean showFailureReason;
@@ -76,6 +78,14 @@ public void setShowCommitters(Boolean showCommitters) {
         this.showCommitters = showCommitters;
     }
 
+    public Boolean getShowTriggeredBy() {
+        return showTriggeredBy;
+    }
+
+    public void setShowTriggeredBy(Boolean showTriggeredBy) {
+        this.showTriggeredBy = showTriggeredBy;
+    }
+
     public int getMaxCommitsToDisplay() {
         return maxCommitsToDisplay;
     }
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainConfig.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainConfig.java
@@ -25,6 +25,7 @@ public class SlackNotificationMainConfig implements ChangeListener {
 	private static final String SHOW_BUILD_AGENT = "showBuildAgent";
 	private static final String SHOW_COMMITS = "showCommits";
 	private static final String SHOW_COMMITTERS = "showCommitters";
+	private static final String SHOW_TRIGGERED_BY = "showTriggeredBy";
 	private static final String SHOW_FAILURE_REASON = "showFailureReason";
 	private static final String MAX_COMMITS_TO_DISPLAY = "maxCommitsToDisplay";
 	private static final String SHOW_ELAPSED_BUILD_TIME = "showElapsedBuildTime";
@@ -305,6 +306,9 @@ public void process(Element rootElement) {
 						if(SlackNotificationMainConfig.this.content.getShowCommitters() != null) {
 							rootElement.setAttribute(SHOW_COMMITTERS, Boolean.toString(SlackNotificationMainConfig.this.content.getShowCommitters()));
 						}
+						if(SlackNotificationMainConfig.this.content.getShowTriggeredBy() != null) {
+							rootElement.setAttribute(SHOW_TRIGGERED_BY, Boolean.toString(SlackNotificationMainConfig.this.content.getShowTriggeredBy()));
+						}
                         if(SlackNotificationMainConfig.this.content.getShowFailureReason() != null) {
                             rootElement.setAttribute(SHOW_FAILURE_REASON, Boolean.toString(SlackNotificationMainConfig.this.content.getShowFailureReason()));
                         }
@@ -389,6 +393,10 @@ void readConfigurationFromXmlElement(Element slackNotificationsElement) {
             {
                 content.setShowCommitters(Boolean.parseBoolean(slackNotificationsElement.getAttributeValue(SHOW_COMMITTERS)));
             }
+            if(slackNotificationsElement.getAttribute(SHOW_TRIGGERED_BY) != null)
+            {
+                content.setShowTriggeredBy(Boolean.parseBoolean(slackNotificationsElement.getAttributeValue(SHOW_TRIGGERED_BY)));
+            }
             if(slackNotificationsElement.getAttribute(MAX_COMMITS_TO_DISPLAY) != null)
             {
                 content.setMaxCommitsToDisplay(Integer.parseInt(slackNotificationsElement.getAttributeValue(MAX_COMMITS_TO_DISPLAY)));
diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainSettings.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainSettings.java
@@ -122,6 +122,10 @@ public boolean getShowCommitters(){
         return this.slackNotificationMainConfig.getContent().getShowCommitters();
     }
 
+    public boolean getShowTriggeredBy(){
+        return this.slackNotificationMainConfig.getContent().getShowTriggeredBy();
+    }
+
     public Boolean getShowFailureReason() {
         return this.slackNotificationMainConfig.getContent().getShowFailureReason();
     }
diff --git a/tcslackbuildnotifier-core/src/test/resources/main-config-full.xml b/tcslackbuildnotifier-core/src/test/resources/main-config-full.xml
@@ -10,6 +10,7 @@
           showElapsedBuildTime="true"
           showCommits="false"
           showCommitters="false"
+          showTriggeredBy="false"
           maxCommitsToDisplay="15"
           showFailureReason="true">
     <proxy host="myproxy.mycompany.com" port="8080" username="some-username" password="some-password" />
diff --git a/tcslackbuildnotifier-core/src/test/resources/project-settings-test-custom-content.xml b/tcslackbuildnotifier-core/src/test/resources/project-settings-test-custom-content.xml
@@ -11,6 +11,7 @@
                  showElapsedBuildTime="true"
                  showCommits="true"
                  showCommitters="true"
+                 showTriggeredBy="true"
                  maxCommitsToDisplay="20"
                 showFailureReason="true"/>
     </slackNotification>
diff --git a/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotificationAjaxEditPageController.java b/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotificationAjaxEditPageController.java
@@ -175,6 +175,9 @@ protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse
                                             content.setShowCommitters((request.getParameter("showCommitters") != null)
                                                     && ("on".equalsIgnoreCase(request.getParameter("showCommitters"))));
 
+                                            content.setShowTriggeredBy((request.getParameter("showTriggeredBy") != null)
+                                                    && ("on".equalsIgnoreCase(request.getParameter("showTriggeredBy"))));
+
                                             content.setShowElapsedBuildTime((request.getParameter("showElapsedBuildTime") != null)
                                                     && ("on".equalsIgnoreCase(request.getParameter("showElapsedBuildTime"))));
 
diff --git a/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierAdminPage.java b/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierAdminPage.java
@@ -68,6 +68,7 @@ public void fillModel(@NotNull Map<String, Object> model, @NotNull HttpServletRe
         model.put("showBuildAgent", this.slackMainSettings.getShowBuildAgent());
         model.put("showCommits", this.slackMainSettings.getShowCommits());
         model.put("showCommitters", this.slackMainSettings.getShowCommitters());
+        model.put("showTriggeredBy", this.slackMainSettings.getShowTriggeredBy());
         model.put("showElapsedBuildTime", this.slackMainSettings.getShowElapsedBuildTime());
         model.put("showFailureReason", this.slackMainSettings.getShowFailureReason());
 
diff --git a/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierSettingsController.java b/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierSettingsController.java
@@ -43,6 +43,7 @@ public class SlackNotifierSettingsController extends BaseController {
     private String showBuildAgent;
     private String showCommits;
     private String showCommitters;
+    private String showTriggeredBy;
     private String showElapsedBuildTime;
     private String showFailureReason;
     private String proxyHost;
@@ -111,6 +112,7 @@ private void setRequestParams(HttpServletRequest request) {
         showBuildAgent = request.getParameter("showBuildAgent");
         showCommits = request.getParameter("showCommits");
         showCommitters = request.getParameter("showCommitters");
+        showTriggeredBy = request.getParameter("showTriggeredBy");
         showElapsedBuildTime = request.getParameter("showElapsedBuildTime");
         showFailureReason = request.getParameter("showFailureReason");
         proxyHost = request.getParameter("proxyHost");
@@ -127,8 +129,12 @@ private HashMap<String, Object> handleTestNotification(HttpServletRequest reques
 
         SlackNotification notification = createMockNotification(teamName, defaultChannel, botName,
                 token, iconUrl, Integer.parseInt(maxCommitsToDisplay),
-                Boolean.parseBoolean(showElapsedBuildTime), Boolean.parseBoolean(showBuildAgent),
-                Boolean.parseBoolean(showCommits), Boolean.parseBoolean(showCommitters), Boolean.parseBoolean(showFailureReason),
+                Boolean.parseBoolean(showElapsedBuildTime),
+                Boolean.parseBoolean(showBuildAgent),
+                Boolean.parseBoolean(showCommits),
+                Boolean.parseBoolean(showCommitters),
+                Boolean.parseBoolean(showTriggeredBy),
+                Boolean.parseBoolean(showFailureReason),
                 proxyHost, proxyPort, proxyUser, proxyPassword);
 
 
@@ -168,7 +174,7 @@ private boolean isNullOrEmpty(String str){
     public SlackNotification createMockNotification(String teamName, String defaultChannel, String botName,
                                                     String token, String iconUrl, Integer maxCommitsToDisplay,
                                                     Boolean showElapsedBuildTime, Boolean showBuildAgent, Boolean showCommits,
-                                                    Boolean showCommitters, Boolean showFailureReason, String proxyHost,
+                                                    Boolean showCommitters, Boolean showTriggeredBy, Boolean showFailureReason, String proxyHost,
                                                     String proxyPort, String proxyUser, String proxyPassword) {
         SlackNotification notification = new SlackNotificationImpl(defaultChannel);
         notification.setTeamName(teamName);
@@ -180,6 +186,7 @@ public SlackNotification createMockNotification(String teamName, String defaultC
         notification.setShowBuildAgent(showBuildAgent);
         notification.setShowCommits(showCommits);
         notification.setShowCommitters(showCommitters);
+        notification.setShowTriggeredBy(showTriggeredBy);
         notification.setShowFailureReason(showFailureReason);
 
         if(proxyHost != null && !StringUtil.isEmpty(proxyHost)){
@@ -245,6 +252,7 @@ private HashMap<String, Object> handleConfigurationChange(HttpServletRequest req
         this.config.getContent().setShowBuildAgent(Boolean.parseBoolean(showBuildAgent));
         this.config.getContent().setShowCommits(Boolean.parseBoolean(showCommits));
         this.config.getContent().setShowCommitters(Boolean.parseBoolean(showCommitters));
+        this.config.getContent().setShowTriggeredBy(Boolean.parseBoolean(showTriggeredBy));
         this.config.getContent().setShowElapsedBuildTime((Boolean.parseBoolean(showElapsedBuildTime)));
         this.config.getContent().setShowFailureReason((Boolean.parseBoolean(showFailureReason)));
 
diff --git a/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/bean/SlacknotificationConfigAndBuildTypeListHolder.java b/tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/bean/SlacknotificationConfigAndBuildTypeListHolder.java
@@ -35,6 +35,7 @@ public class SlacknotificationConfigAndBuildTypeListHolder {
     private boolean showElapsedBuildTime;
     private boolean showCommits;
     private boolean showCommitters;
+    private boolean showTriggeredBy;
     private int maxCommitsToDisplay;
     private boolean showFailureReason;
     private String botName;
@@ -61,6 +62,7 @@ public SlacknotificationConfigAndBuildTypeListHolder(SlackNotificationConfig con
         showElapsedBuildTime = valueOrFallback(config.getContent().getShowElapsedBuildTime(), valueOrFallback(mainSettings.getShowElapsedBuildTime(), SlackNotificationContentConfig.DEFAULT_SHOW_ELAPSED_BUILD_TIME));
         showCommits = valueOrFallback(config.getContent().getShowCommits(), valueOrFallback(mainSettings.getShowCommits(), SlackNotificationContentConfig.DEFAULT_SHOW_COMMITS));
         showCommitters = valueOrFallback(config.getContent().getShowCommitters(), valueOrFallback(mainSettings.getShowCommitters(), SlackNotificationContentConfig.DEFAULT_SHOW_COMMITTERS));
+        showTriggeredBy = valueOrFallback(config.getContent().getShowTriggeredBy(), valueOrFallback(mainSettings.getShowTriggeredBy(), SlackNotificationContentConfig.DEFAULT_SHOW_TRIGGERED_BY));
         showFailureReason = valueOrFallback(config.getContent().getShowFailureReason(), valueOrFallback(mainSettings.getShowFailureReason(), SlackNotificationContentConfig.DEFAULT_SHOW_FAILURE_REASON));
         botName = valueOrFallback(config.getContent().getBotName(), SlackNotificationMainConfig.DEFAULT_BOTNAME);
         iconUrl = valueOrFallback(config.getContent().getIconUrl(), SlackNotificationMainConfig.DEFAULT_ICONURL);
diff --git a/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/index.jsp b/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/index.jsp
@@ -144,6 +144,7 @@
 					jQuerySlacknotification('#showBuildAgent').attr('checked', slacknotification.showBuildAgent);
 					jQuerySlacknotification('#showCommits').attr('checked', slacknotification.showCommits);
 					jQuerySlacknotification('#showCommitters').attr('checked', slacknotification.showCommitters);
+					jQuerySlacknotification('#showTriggeredBy').attr('checked', slacknotification.showTriggeredBy);
 					jQuerySlacknotification('#showElapsedBuildTime').attr('checked', slacknotification.showElapsedBuildTime);
 					jQuerySlacknotification('#botName').val(slacknotification.botName);
 					jQuerySlacknotification('#iconUrl').val(slacknotification.iconUrl)
diff --git a/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/js/slackNotifierAdmin.js b/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/js/slackNotifierAdmin.js
@@ -84,6 +84,7 @@ var SlackNotifierAdmin = {
                     maxCommitsToDisplay: $("maxCommitsToDisplay").value,
                     showCommits: $("showCommits").checked,
                     showCommitters: $("showCommitters").checked,
+                    showTriggeredBy: $("showTriggeredBy").checked,
                     showElapsedBuildTime: $("showElapsedBuildTime").checked,
                     showBuildAgent: $("showBuildAgent").checked,
                     showFailureReason: $("showFailureReason").checked,
@@ -120,6 +121,7 @@ var SlackNotifierAdmin = {
                     maxCommitsToDisplay: $("maxCommitsToDisplay").value,
                     showCommits: $("showCommits").checked,
                     showCommitters: $("showCommitters").checked,
+                    showTriggeredBy: $("showTriggeredBy").checked,
                     showElapsedBuildTime: $("showElapsedBuildTime").checked,
                     showBuildAgent: $("showBuildAgent").checked,
                     showFailureReason: $("showFailureReason").checked,
diff --git a/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/slackAdminSettings.jsp b/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/slackAdminSettings.jsp
diff --git a/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/slackNotificationInclude.jsp b/tcslackbuildnotifier-web-ui/src/main/resources/buildServerResources/SlackNotification/slackNotificationInclude.jsp
diff --git a/tcslackbuildnotifier-web-ui/src/test/java/slacknotifications/teamcity/extension/SlackNotificationSettingsControllerTest.java b/tcslackbuildnotifier-web-ui/src/test/java/slacknotifications/teamcity/extension/SlackNotificationSettingsControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public class SlackNotificationMainConfig implements ChangeListener {`
`25`	`25`	`private static final String SHOW_BUILD_AGENT = "showBuildAgent";`
`26`	`26`	`private static final String SHOW_COMMITS = "showCommits";`
`27`	`27`	`private static final String SHOW_COMMITTERS = "showCommitters";`
	`28`	`+ private static final String SHOW_TRIGGERED_BY = "showTriggeredBy";`
`28`	`29`	`private static final String SHOW_FAILURE_REASON = "showFailureReason";`
`29`	`30`	`private static final String MAX_COMMITS_TO_DISPLAY = "maxCommitsToDisplay";`
`30`	`31`	`private static final String SHOW_ELAPSED_BUILD_TIME = "showElapsedBuildTime";`
`@@ -305,6 +306,9 @@ public void process(Element rootElement) {`
`305`	`306`	`if(SlackNotificationMainConfig.this.content.getShowCommitters() != null) {`
`306`	`307`	`rootElement.setAttribute(SHOW_COMMITTERS, Boolean.toString(SlackNotificationMainConfig.this.content.getShowCommitters()));`
`307`	`308`	`}`
	`309`	`+ if(SlackNotificationMainConfig.this.content.getShowTriggeredBy() != null) {`
	`310`	`+ rootElement.setAttribute(SHOW_TRIGGERED_BY, Boolean.toString(SlackNotificationMainConfig.this.content.getShowTriggeredBy()));`
	`311`	`+ }`
`308`	`312`	`if(SlackNotificationMainConfig.this.content.getShowFailureReason() != null) {`
`309`	`313`	`rootElement.setAttribute(SHOW_FAILURE_REASON, Boolean.toString(SlackNotificationMainConfig.this.content.getShowFailureReason()));`
`310`	`314`	`}`
`@@ -389,6 +393,10 @@ void readConfigurationFromXmlElement(Element slackNotificationsElement) {`
`389`	`393`	`{`
`390`	`394`	`content.setShowCommitters(Boolean.parseBoolean(slackNotificationsElement.getAttributeValue(SHOW_COMMITTERS)));`
`391`	`395`	`}`
	`396`	`+ if(slackNotificationsElement.getAttribute(SHOW_TRIGGERED_BY) != null)`
	`397`	`+ {`
	`398`	`+ content.setShowTriggeredBy(Boolean.parseBoolean(slackNotificationsElement.getAttributeValue(SHOW_TRIGGERED_BY)));`
	`399`	`+ }`
`392`	`400`	`if(slackNotificationsElement.getAttribute(MAX_COMMITS_TO_DISPLAY) != null)`
`393`	`401`	`{`
`394`	`402`	`content.setMaxCommitsToDisplay(Integer.parseInt(slackNotificationsElement.getAttributeValue(MAX_COMMITS_TO_DISPLAY)));`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,10 @@ public boolean getShowCommitters(){`
`122`	`122`	`return this.slackNotificationMainConfig.getContent().getShowCommitters();`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ public boolean getShowTriggeredBy(){`
	`126`	`+ return this.slackNotificationMainConfig.getContent().getShowTriggeredBy();`
	`127`	`+ }`
	`128`	`+`
`125`	`129`	`public Boolean getShowFailureReason() {`
`126`	`130`	`return this.slackNotificationMainConfig.getContent().getShowFailureReason();`
`127`	`131`	`}`