diff options
| author | 6543 <24977596+6543@users.noreply.github.com> | 2019-11-20 15:50:54 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-11-20 22:50:54 +0800 |
| commit | 2ab8c78c30f6e29206b07fe15b0aec6c21df7005 (patch) | |
| tree | 79878ac7fd9cba86d9b5ad6bb8cb763340179b51 /models/issue_watch.go | |
| parent | dfd8b94923b90edbd3109f5afc3670fb1012e9c8 (diff) | |
| download | gitea-2ab8c78c30f6e29206b07fe15b0aec6c21df7005.tar.gz gitea-2ab8c78c30f6e29206b07fe15b0aec6c21df7005.zip | |
Refactor Issues Subscription (#8738)
* FIX: getIssueWatchers() get only aktive suscriber
* save query to work later with it or not ...
* fix test + add new case
* corect tests + GetIssueWatch
* API issue_subscripton: Put/Delete require tocken
* remove redundant code
* swagger specify return value
* remove unused binding
* remove note
because I'll implement this in a different way and in another PR
* ID should be unique!
* use xorm session
* Revert "use xorm session"
This reverts commit c1de540147199f2f1a8dd0d008f54af3603e2229.
* better test code
* more acurate comments
* use assert.False/True instead of Equal
* use more assert methodes
Diffstat (limited to 'models/issue_watch.go')
| -rw-r--r-- | models/issue_watch.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/issue_watch.go b/models/issue_watch.go index 3d7d48a125..e42e371a1f 100644 --- a/models/issue_watch.go +++ b/models/issue_watch.go @@ -56,6 +56,7 @@ func getIssueWatch(e Engine, userID, issueID int64) (iw *IssueWatch, exists bool exists, err = e. Where("user_id = ?", userID). And("issue_id = ?", issueID). + And("is_watching = ?", true). Get(iw) return } @@ -80,6 +81,7 @@ func GetIssueWatchers(issueID int64) (IssueWatchList, error) { func getIssueWatchers(e Engine, issueID int64) (watches IssueWatchList, err error) { err = e. Where("`issue_watch`.issue_id = ?", issueID). + And("`issue_watch`.is_watching = ?", true). And("`user`.is_active = ?", true). And("`user`.prohibit_login = ?", false). Join("INNER", "`user`", "`user`.id = `issue_watch`.user_id"). |