yona-projects / yona star
Wansoon Park 2014-02-06
Remove 'ISSUE_REFERRED' event_type in user project notification
@4afc0ebf062219d4b5af2e59a5ec5f13e9fa67ae
83ab832
4afc0eb
app/models/enumeration/EventType.java
--- app/models/enumeration/EventType.java
+++ app/models/enumeration/EventType.java
@@ -16,12 +16,12 @@
 
     NEW_PULL_REQUEST_COMMENT("notification.type.new.simple.comment", 8),
 
     MEMBER_ENROLL_REQUEST("notification.type.member.enroll", 9),
 
     PULL_REQUEST_MERGED("notification.type.pullrequest.merged", 10),
 
-    ISSUE_REFERRED_FROM_COMMIT("notification.type.issue.referred", 11),
 
+    ISSUE_REFERRED_FROM_COMMIT("notification.type.issue.referred.from.commit", 11),
 
     PULL_REQUEST_COMMIT_CHANGED("notification.type.pullrequest.commit.changed", 12),
 
     NEW_COMMIT("notification.type.new.commit", 13),
 
     PULL_REQUEST_REVIEWED("notification.type.pullrequest.reviewed", 14),
 
     PULL_REQUEST_UNREVIEWED("notification.type.pullrequest.unreviewed", 15),
 
-    ISSUE_REFERRED_FROM_PULL_REQUEST("notification.type.issue.referred", 16);
 
+    ISSUE_REFERRED_FROM_PULL_REQUEST("notification.type.issue.referred.from.pullrequest", 16);
 
 
     private String descr;
 
4afc0eb
conf/evolutions/default/60.sql (added)
+++ conf/evolutions/default/60.sql
@@ -0,0 +1,4 @@
+# --- !Ups
+DELETE FROM user_project_notification WHERE notification_type = 'ISSUE_REFERRED';
+
+# --- !Downs
83ab832
4afc0eb
conf/messages
--- conf/messages
+++ conf/messages
@@ -293,7 +293,8 @@
 
 notification.pullrequest.reviewed = PullRequest has been reviewed by {0}
 
 notification.pullrequest.unreviewed = PullRequest has been unreviewed by {0}
 
 notification.type.issue.assignee.changed = Changed Issue's Assignee
 
-notification.type.issue.referred = Issue Reffered
 
+notification.type.issue.referred.from.commit = Issue Referred from Commit
 
+notification.type.issue.referred.from.pullrequest = Issue Referred from PullRequest
 
 notification.type.issue.state.changed = Changed Issue's State
 
 notification.type.member.enroll = Requests for joining projects
 
 notification.type.new.comment = New Comment on a Posting or a Issue
83ab832
4afc0eb
conf/messages.ko
--- conf/messages.ko
+++ conf/messages.ko
@@ -293,7 +293,8 @@
 
 notification.pullrequest.reviewed = {0} 님이 리뷰를 완료했습니다.
 
 notification.pullrequest.unreviewed = {0} 님이 리뷰를 취소했습니다.
 
 notification.type.issue.assignee.changed = 이슈 담당자 변경
 
-notification.type.issue.referred = 이슈가 언급 될 때
 
+notification.type.issue.referred.from.commit = 커밋에서의 이슈 언급
 
+notification.type.issue.referred.from.pullrequest = 코드 주고받기에서의 이슈 언급
 
 notification.type.issue.state.changed = 이슈 상태 변경
 
 notification.type.member.enroll = 멤버 등록 요청
 
 notification.type.new.comment = 게시물과 이슈 새 댓글 등록
Add a comment
List