更新了任务的描述的动态显示有误

wanghengheng · wanghengheng · commit 3fed90535886 · 2014-12-23T15:48:54.000+08:00
diff --git a/Coding_iOS/Models/ProjectActivities.m b/Coding_iOS/Models/ProjectActivities.m
@@ -201,13 +201,15 @@ - (NSMutableString *)actionStr{
         }else if ([_target_type isEqualToString:@"Task"]){
             [self addActionUser:_user];
             if ([_action isEqualToString:@"update_priority"]) {
-                [_actionStr appendString:@"&#26356;&#26032;&#20102;&#20219;&#21153;&#30340;&#20248;&#20808;&#32423;"];
+                [_actionStr appendFormat:@"&#26356;&#26032;&#20102;&#20219;&#21153;<%@>&#30340;&#20248;&#20808;&#32423;", _task.title];
             }else if ([_action isEqualToString:@"update_deadline"]) {
                 if (_task.deadline && _task.deadline.length > 0) {
-                    [_actionStr appendString:@"&#26356;&#26032;&#20102;&#20219;&#21153;&#30340;&#25130;&#27490;&#26085;&#26399;"];
+                    [_actionStr appendFormat:@"&#26356;&#26032;&#20102;&#20219;&#21153;<%@>&#30340;&#25130;&#27490;&#26085;&#26399;", _task.title];
                 }else{
-                    [_actionStr appendString:@"&#31227;&#38500;&#20102;&#20219;&#21153;&#30340;&#25130;&#27490;&#26085;&#26399;"];
+                    [_actionStr appendFormat:@"&#31227;&#38500;&#20102;&#20219;&#21153;<%@>&#30340;&#25130;&#27490;&#26085;&#26399;", _task.title];
                 }
+            }else if ([_action isEqualToString:@"update_description"]) {
+                [_actionStr appendFormat:@"&#26356;&#26032;&#20102;&#20219;&#21153;<%@>&#30340;&#25551;&#36848;", _task.title];
             }else{
                 [_actionStr appendString:_action_msg];
                 if (_origin_task.owner) {
@@ -223,7 +225,7 @@ - (NSMutableString *)actionStr{
             }
         }else if ([_target_type isEqualToString:@"TaskComment"]){
             [self addActionUser:_user];
-            [_actionStr appendFormat:@"&#35780;&#35770;&#20102;&#20219;&#21153;:%@", _task.title];
+            [_actionStr appendFormat:@"%@&#20219;&#21153;<%@>&#30340;&#35780;&#35770;", _action_msg, _task.title];
         }else{
             [self addActionUser:_user];
             [_actionStr appendString:_action_msg];
@@ -295,6 +297,8 @@ - (NSMutableString *)contentStr{
                 }
             }else if ([_action isEqualToString:@"update_deadline"] && _task.deadline && _task.deadline.length > 0) {
                 linkStr = [NSString stringWithFormat:@"[%@] %@", [NSDate convertStr_yyyy_MM_ddToDisplay:_task.deadline], _task.title];
+            }else if ([_action isEqualToString:@"update_description"]) {
+                linkStr = _task.description_mine;
             }else{
                 linkStr = _task.title;
             }
diff --git a/Coding_iOS/Models/Task.h b/Coding_iOS/Models/Task.h
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSInteger, TaskHandleType) {
 
 @interface Task : NSObject
 @property (readwrite, nonatomic, strong) User *owner, *creator;
-@property (readwrite, nonatomic, strong) NSString *title, *content, *backend_project_path, *deadline, *path;
+@property (readwrite, nonatomic, strong) NSString *title, *content, *backend_project_path, *deadline, *path, *description_mine;
 @property (readwrite, nonatomic, strong) NSDate *created_at, *updated_at;
 @property (readwrite, nonatomic, strong) Project *project;
 @property (readwrite, nonatomic, strong) NSNumber *id, *status, *owner_id, *priority, *comments;
diff --git a/Coding_iOS/Models/Task.m b/Coding_iOS/Models/Task.m
@@ -37,6 +37,13 @@ - (void)setOwner:(User *)owner{
 //    }
 //}
 
+- (void)setDescription_mine:(NSString *)description_mine{
+    if (_description_mine != description_mine) {
+        HtmlMedia *htmlMedia = [HtmlMedia htmlMediaWithString:description_mine trimWhitespaceAndNewline:YES];
+        _description_mine = htmlMedia.contentDisplay;
+    }
+}
+
 + (Task *)taskWithProject:(Project *)project{
     Task *curTask = [[Task alloc] init];
     curTask.project = project;
diff --git a/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m b/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m
@@ -193,12 +193,16 @@ +(id)objectOfClass:(NSString *)object fromJSON:(NSDictionary *)dict {
     NSDictionary *mapDictionary = [newObject propertyDictionary];
     
     for (NSString *key in [dict allKeys]) {
-        NSString *propertyName = [mapDictionary objectForKey:key];
-        
+        NSString *tempKey;
+        if ([key isEqualToString:@"description"]) {
+            tempKey = [key stringByAppendingString:@"_mine"];
+        }else{
+            tempKey = key;
+        }
+        NSString *propertyName = [mapDictionary objectForKey:tempKey];
         if (!propertyName) {
             continue;
         }
-        
         // If it's a Dictionary, make into object
         if ([[dict objectForKey:key] isKindOfClass:[NSDictionary class]]) {
             //id newObjectProperty = [newObject valueForKey:propertyName];
