【分支管理】 web 添加保护分支管理员动态消息，app 需同步

wanghengheng · wanghengheng · commit bffe24192a52 · 2018-04-19T18:42:22.000+08:00
diff --git a/Coding_iOS/Controllers/ProjectMemberActivityListViewController.m b/Coding_iOS/Controllers/ProjectMemberActivityListViewController.m
@@ -167,6 +167,16 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
             }else{
                 linkPath = proAct.wiki_path;
             }
+        }else if ([target_type isEqualToString:@"BranchMember"]){
+            if ([@[@"add", @"remove"] containsObject:proAct.action]) {
+                linkPath = [NSString stringWithFormat:@"/u/%@", proAct.target_user.global_key];
+            }else{//deny_push/allow_push
+                ProjectViewController *vc = [ProjectViewController codeVCWithCodeRef:proAct.ref_name andProject:project];
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }else if ([target_type isEqualToString:@"ProtectedBranch"]){
+            ProjectViewController *vc = [ProjectViewController codeVCWithCodeRef:proAct.ref_name andProject:project];
+            [self.navigationController pushViewController:vc animated:YES];
         }else{
             if ([target_type isEqualToString:@"Project"]){//&#36716;&#35753;&#39033;&#30446;&#20043;&#31867;&#30340;
                 //            }else if ([target_type isEqualToString:@"MergeRequestComment"]){//&#36807;&#26399;&#31867;&#22411;&#65292;&#24050;&#29992;CommitLineNote&#26367;&#20195;
diff --git a/Coding_iOS/Controllers/ProjectViewController.m b/Coding_iOS/Controllers/ProjectViewController.m
@@ -551,6 +551,16 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
             }else{
                 linkPath = proAct.wiki_path;
             }
+        }else if ([target_type isEqualToString:@"BranchMember"]){
+            if ([@[@"add", @"remove"] containsObject:proAct.action]) {
+                linkPath = [NSString stringWithFormat:@"/u/%@", proAct.target_user.global_key];
+            }else{//deny_push/allow_push
+                ProjectViewController *vc = [ProjectViewController codeVCWithCodeRef:proAct.ref_name andProject:project];
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }else if ([target_type isEqualToString:@"ProtectedBranch"]){
+            ProjectViewController *vc = [ProjectViewController codeVCWithCodeRef:proAct.ref_name andProject:project];
+            [self.navigationController pushViewController:vc animated:YES];
         }else{
             if ([target_type isEqualToString:@"Project"]){//&#36716;&#35753;&#39033;&#30446;&#20043;&#31867;&#30340;
                 //            }else if ([target_type isEqualToString:@"MergeRequestComment"]){//&#36807;&#26399;&#31867;&#22411;&#65292;&#24050;&#29992;CommitLineNote&#26367;&#20195;
diff --git a/Coding_iOS/Models/ProjectActivity.h b/Coding_iOS/Models/ProjectActivity.h
@@ -20,7 +20,7 @@
 
 @interface ProjectActivity : NSObject
 @property (readwrite, nonatomic, strong) NSNumber *id;
-@property (readwrite, nonatomic, strong) NSString *target_type, *action, *action_msg, *type, *ref, *ref_type, *ref_path, *pull_request_title, *merge_request_title, *comment_content, *merge_request_path, *pull_request_path, *version, *wiki_title, *wiki_path, *old_name;
+@property (readwrite, nonatomic, strong) NSString *target_type, *action, *action_msg, *type, *ref, *ref_type, *ref_path, *pull_request_title, *merge_request_title, *comment_content, *merge_request_path, *pull_request_path, *version, *wiki_title, *wiki_path, *old_name, *ref_name;
 @property (readwrite, nonatomic, strong) User *user, *target_user, *watcher;
 @property (readwrite, nonatomic, strong) NSDate *created_at;
 @property (readwrite, nonatomic, strong) Task *origin_task, *task;
diff --git a/Coding_iOS/Models/ProjectActivity.m b/Coding_iOS/Models/ProjectActivity.m
@@ -138,6 +138,15 @@ - (NSMutableString *)actionStr{
                     if ([_action isEqualToString:@"comment"]) {
                         [_actionStr appendFormat:@"&#12300;%@&#12301;", _project_topic.parent.title];
                     }
+                }else if ([_target_type isEqualToString:@"BranchMember"]){
+                    if ([@[@"add", @"remove"] containsObject:_action]) {
+                        [_actionStr appendString:@"&#20998;&#25903;&#31649;&#29702;&#21592;"];
+                    }else{//deny_push/allow_push
+                        [self addActionUser:self.target_user];
+                        [_actionStr appendString:@"&#30452;&#25509; Push &#20445;&#25252;&#20998;&#25903;"];
+                    }
+                }else if ([_target_type isEqualToString:@"ProtectedBranch"]){
+//                    enable_protected_branch/allow_force_push/disable_protected_branch
                 }else if ([_target_type isEqualToString:@"ProjectFile"]){
                     if ([_action isEqualToString:@"rename"]) {
                         [_actionStr appendString:@"&#20462;&#25913;&#20102;&#25991;&#20214;&#21517;&#31216;"];
@@ -259,6 +268,14 @@ - (NSMutableString *)contentStr{
                 [_contentStr appendFormat:@"%@", _wiki_title];
             }else if ([_target_type isEqualToString:@"ProjectTweet"]){
                 [_contentStr saveAppendString:_content];
+            }else if ([_target_type isEqualToString:@"BranchMember"]){
+                if ([@[@"add", @"remove"] containsObject:_action]) {
+                    [_contentStr saveAppendString:self.target_user.name];
+                }else{//deny_push/allow_push
+                    [_contentStr saveAppendString:self.ref_name];
+                }
+            }else if ([_target_type isEqualToString:@"ProtectedBranch"]){
+                [_contentStr saveAppendString:self.ref_name];
             }else{
                 [_contentStr appendString:@"**&#26410;&#30693;**"];
             }
