LineNote 动态 显示不全的bug

wanghengheng · wanghengheng · commit e7004e4c7418 · 2015-05-29T15:37:38.000+08:00
diff --git a/Coding_iOS/Models/ProjectActivity.m b/Coding_iOS/Models/ProjectActivity.m
@@ -124,7 +124,7 @@ - (NSMutableString *)actionStr{
                 }else if ([_target_type isEqualToString:@"MergeRequestComment"]){
                     [_actionStr appendFormat:@" [%@] &#20013;&#30340; Merge Request [%@]", _depot.name, _merge_request_title];
                 }else if ([_target_type isEqualToString:@"CommitLineNote"]){
-                    [_actionStr appendFormat:@" [%@] &#30340;&#25552;&#20132; [%@] ", _project.full_name, (_line_note.commit_id.length >= 10? [_line_note.commit_id substringToIndex:10]: _line_note.commit_id)];
+                    [_actionStr appendFormat:@" [%@] &#30340; %@ [%@] ", _project.full_name, _line_note.noteable_type, _line_note.noteable_title];
                 }
             }
         }
diff --git a/Coding_iOS/Models/ProjectLineNoteActivity.h b/Coding_iOS/Models/ProjectLineNoteActivity.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @interface ProjectLineNoteActivity : NSObject
-@property (readwrite, strong, nonatomic) NSString *commit_id, *commit_path, *content, *path;
+@property (readwrite, strong, nonatomic) NSString *noteable_id, *noteable_title, *noteable_url, *content, *path, *noteable_type;
 @property (readwrite, strong, nonatomic) NSNumber *id;
 @property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;
 @end
diff --git a/Coding_iOS/Models/ProjectLineNoteActivity.m b/Coding_iOS/Models/ProjectLineNoteActivity.m
@@ -15,4 +15,16 @@ - (void)setContent:(NSString *)content{
         _content = _htmlMedia.contentDisplay;
     }
 }
+
+- (NSString *)noteable_type{
+    if ([_noteable_type isEqualToString:@"Commit"]) {
+        return @"Commit";
+    }else if ([_noteable_type isEqualToString:@"MergeRequestBean"]) {
+        return @"MergeRequest";
+    }else if ([_noteable_type isEqualToString:@"PullRequestBean"]) {
+        return @"PullRequest";
+    }else {
+        return @"(&#8857;_&#8857;)?";
+    }
+}
 @end

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ - (NSMutableString *)actionStr{`
`124`	`124`	`}else if ([_target_type isEqualToString:@"MergeRequestComment"]){`
`125`	`125`	`[_actionStr appendFormat:@" [%@] 中的 Merge Request [%@]", _depot.name, _merge_request_title];`
`126`	`126`	`}else if ([_target_type isEqualToString:@"CommitLineNote"]){`
`127`		`- [_actionStr appendFormat:@" [%@] 的提交 [%@] ", _project.full_name, (_line_note.commit_id.length >= 10? [_line_note.commit_id substringToIndex:10]: _line_note.commit_id)];`
	`127`	`+ [_actionStr appendFormat:@" [%@] 的 %@ [%@] ", _project.full_name, _line_note.noteable_type, _line_note.noteable_title];`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`}`