Skip to content

Commit bd57b7b

Browse files
committed
Merge pull request #66 from PeteGoo/FixBrokenUpdatingOfNotifications
Fix broken project slack notifications settings
2 parents 08edf95 + b840679 commit bd57b7b

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

tcslackbuildnotifier-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotificationAjaxEditPageController.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public class SlackNotificationAjaxEditPageController extends BaseController {
4545
private ProjectSettingsManager mySettings;
4646
private final String myPluginPath;
4747
private final SlackNotificationPayloadManager myManager;
48-
49-
public SlackNotificationAjaxEditPageController(SBuildServer server, WebControllerManager webManager,
48+
49+
public SlackNotificationAjaxEditPageController(SBuildServer server, WebControllerManager webManager,
5050
ProjectSettingsManager settings, SlackNotificationProjectSettings whSettings, SlackNotificationPayloadManager manager,
5151
PluginDescriptor pluginDescriptor, SlackNotificationMainSettings mainSettings) {
5252
super(server);
@@ -91,7 +91,7 @@ protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse
9191
SUser myUser = SessionUser.getUser(request);
9292
SProject myProject = null;
9393
SlackNotificationProjectSettings projSettings = null;
94-
94+
9595
if (request.getMethod().equalsIgnoreCase("post")){
9696
if ((request.getParameter("projectId") != null)
9797
&& request.getParameter("projectId").startsWith("project")){
@@ -201,19 +201,19 @@ protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse
201201
}
202202

203203
if (request.getParameter("slackNotificationId").equals("new")){
204-
projSettings.addNewSlackNotification(myProject.getProjectId(),request.getParameter("token"),request.getParameter("channel"), request.getParameter("team"), enabled,
205-
states, buildTypeAll, buildTypeSubProjects, buildTypes, mentionChannelEnabled, mentionSlackUserEnabled);
204+
projSettings.addNewSlackNotification(myProject.getProjectId(), request.getParameter("token"), request.getParameter("channel"), request.getParameter("team"), enabled,
205+
states, buildTypeAll, buildTypeSubProjects, buildTypes, mentionChannelEnabled, mentionSlackUserEnabled);
206206
if(projSettings.updateSuccessful()){
207207
myProject.persist();
208208
params.put("messages", "<errors />");
209209
} else {
210210
params.put("message", "<errors><error id=\"\">" + projSettings.getUpdateMessage() + "</error>");
211211
}
212212
} else {
213-
projSettings.updateSlackNotification(myProject.getProjectId(),request.getParameter("slackNotificationId"),
214-
request.getParameter("token"),request.getParameter("channel"), enabled,
215-
states, buildTypeAll, buildTypeSubProjects, buildTypes, mentionChannelEnabled,
216-
mentionSlackUserEnabled, content);
213+
projSettings.updateSlackNotification(myProject.getProjectId(), request.getParameter("token"),
214+
request.getParameter("slackNotificationId"), request.getParameter("channel"), enabled,
215+
states, buildTypeAll, buildTypeSubProjects, buildTypes, mentionChannelEnabled,
216+
mentionSlackUserEnabled, content);
217217
if(projSettings.updateSuccessful()){
218218
myProject.persist();
219219
params.put("messages", "<errors />");

0 commit comments

Comments
 (0)