Merge pull request gogs#442 from compressed/org_hook

Organization-level Webhooks

Author: unknwon

cmd/web.go

@@ -261,6 +261,13 @@ func runWeb(*cli.Context) {
 			m.Group("/settings", func(r *macaron.Router) {
 				r.Get("", org.Settings)
 				r.Post("", bindIgnErr(auth.UpdateOrgSettingForm{}), org.SettingsPost)
+				r.Get("/hooks", org.SettingsHooks)
+				r.Get("/hooks/new", repo.WebHooksNew)
+				r.Post("/hooks/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+				r.Post("/hooks/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+				r.Get("/hooks/:id", repo.WebHooksEdit)
+				r.Post("/hooks/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+				r.Post("/hooks/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
 				r.Route("/delete", "GET,POST", org.SettingsDelete)
 			})
 

conf/locale/locale_en-US.ini

@@ -207,7 +207,7 @@ unbind = Unbind
 unbind_success = Social account has been unbound.
 
 delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
+delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
 confirm_delete_account = Confirm Deletion
 
 [repo]
@@ -316,8 +316,9 @@ settings.update_settings = Update Settings
 settings.update_setting_success = Organization setting has been successfully updated.
 settings.delete = Delete Organization
 settings.delete_account = Delete This Organization
-settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undo!
+settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undone!
 settings.confirm_delete_account = Confirm Deletion
+settings.hooks_desc = Add webhooks that will be triggered for <strong>all repositories</strong> under this organization.
 
 members.public = Public
 members.public_helper = make private

models/action.go

@@ -220,8 +220,20 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 
 	ws, err := GetActiveWebhooksByRepoId(repoId)
 	if err != nil {
-		return errors.New("action.CommitRepoAction(GetWebhooksByRepoId): " + err.Error())
-	} else if len(ws) == 0 {
+		return errors.New("action.CommitRepoAction(GetActiveWebhooksByRepoId): " + err.Error())
+	}
+
+	// check if repo belongs to org and append additional webhooks
+	if repo.Owner.IsOrganization() {
+		// get hooks for org
+		orgws, err := GetActiveWebhooksByOrgId(repo.OwnerId)
+		if err != nil {
+			return errors.New("action.CommitRepoAction(GetActiveWebhooksByOrgId): " + err.Error())
+		}
+		ws = append(ws, orgws...)
+	}
+
+	if len(ws) == 0 {
 		return nil
 	}
 

models/webhook.go

@@ -45,6 +45,7 @@ type Webhook struct {
 	IsActive     bool
 	HookTaskType HookTaskType
 	Meta         string `xorm:"TEXT"` // store hook-specific attributes
+	OrgId        int64
 }
 
 // GetEvent handles conversion from Events to HookEvent.
@@ -120,6 +121,18 @@ func DeleteWebhook(hookId int64) error {
 	return err
 }
 
+// GetWebhooksByOrgId returns all webhooks for an organization.
+func GetWebhooksByOrgId(orgId int64) (ws []*Webhook, err error) {
+	err = x.Find(&ws, &Webhook{OrgId: orgId})
+	return ws, err
+}
+
+// GetActiveWebhooksByOrgId returns all active webhooks for an organization.
+func GetActiveWebhooksByOrgId(orgId int64) (ws []*Webhook, err error) {
+	err = x.Find(&ws, &Webhook{OrgId: orgId, IsActive: true})
+	return ws, err
+}
+
 //   ___ ___                __   ___________              __
 //  /   |   \  ____   ____ |  | _\__    ___/____    _____|  | __
 // /    ~    \/  _ \ /  _ \|  |/ / |    |  \__  \  /  ___/  |/ /

public/ng/js/gogs.js

@@ -349,17 +349,8 @@ function initRepo() {
     })
 }
 
-function initRepoSetting() {
-    // Options.
-    // Confirmation of changing repository name.
-    $('#repo-setting-form').submit(function (e) {
-        var $reponame = $('#repo_name');
-        if (($reponame.data('repo-name') != $reponame.val()) && !confirm('Repository name has been changed, do you want to continue?')) {
-            e.preventDefault();
-            return true;
-        }
-    });
-
+// when user changes hook type, hide/show proper divs
+function initHookTypeChange() {
     // web hook type change
     $('select#hook-type').on("change", function () {
       hookTypes = ['Gogs','Slack'];
@@ -374,6 +365,20 @@ function initRepoSetting() {
         }
       });
     });
+}
+
+function initRepoSetting() {
+    // Options.
+    // Confirmation of changing repository name.
+    $('#repo-setting-form').submit(function (e) {
+        var $reponame = $('#repo_name');
+        if (($reponame.data('repo-name') != $reponame.val()) && !confirm('Repository name has been changed, do you want to continue?')) {
+            e.preventDefault();
+            return true;
+        }
+    });
+
+    initHookTypeChange();
 
     $('#transfer-button').click(function () {
         $('#transfer-form').show();
@@ -421,6 +426,8 @@ function initOrgSetting() {
             return true;
         }
     });
+
+    initHookTypeChange();
 }
 
 function initInvite() {

routers/org/setting.go

@@ -5,6 +5,7 @@
 package org
 
 import (
+	"github.com/Unknwon/com"
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
@@ -15,6 +16,7 @@ import (
 const (
 	SETTINGS_OPTIONS base.TplName = "org/settings/options"
 	SETTINGS_DELETE  base.TplName = "org/settings/delete"
+	SETTINGS_HOOKS   base.TplName = "org/settings/hooks"
 )
 
 func Settings(ctx *middleware.Context) {
@@ -97,3 +99,29 @@ func SettingsDelete(ctx *middleware.Context) {
 
 	ctx.HTML(200, SETTINGS_DELETE)
 }
+
+func SettingsHooks(ctx *middleware.Context) {
+	ctx.Data["Title"] = ctx.Tr("org.settings")
+	ctx.Data["PageIsSettingsHooks"] = true
+
+	// Delete web hook.
+	remove := com.StrTo(ctx.Query("remove")).MustInt64()
+	if remove > 0 {
+		if err := models.DeleteWebhook(remove); err != nil {
+			ctx.Handle(500, "DeleteWebhook", err)
+			return
+		}
+		ctx.Flash.Success(ctx.Tr("repo.settings.remove_hook_success"))
+		ctx.Redirect(ctx.Org.OrgLink + "/settings/hooks")
+		return
+	}
+
+	ws, err := models.GetWebhooksByOrgId(ctx.Org.Organization.Id)
+	if err != nil {
+		ctx.Handle(500, "GetWebhooksByOrgId", err)
+		return
+	}
+
+	ctx.Data["Webhooks"] = ws
+	ctx.HTML(200, SETTINGS_HOOKS)
+}