can_edit_src_branch

wanghengheng · wanghengheng · commit 2d465a4de309 · 2015-06-09T16:31:56.000+08:00
diff --git a/Coding_iOS/Controllers/MRPRAcceptViewController.m b/Coding_iOS/Controllers/MRPRAcceptViewController.m
@@ -29,6 +29,7 @@ - (void)viewDidLoad{
     
     self.curMRPR = self.curMRPRInfo.mrpr;
     self.curMRPR.del_source_branch = YES;
+    self.curMRPR.can_edit_src_branch = ([_curMRPR isMR] && _curMRPRInfo.can_edit_src_branch.boolValue);
     
     NSString *fromStr, *toStr;
     if (_curMRPR.isMR) {
@@ -60,7 +61,11 @@ - (void)viewDidLoad{
 
 #pragma mark TableM
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 2;
+    if ([_curMRPR isMR] && _curMRPRInfo.can_edit_src_branch.boolValue) {
+        return 2;
+    }else{
+        return 1;
+    }
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return 1;
diff --git a/Coding_iOS/Controllers/MRPRDetailViewController.m b/Coding_iOS/Controllers/MRPRDetailViewController.m
@@ -190,8 +190,7 @@ - (void)actionMRPR:(UIButton *)sender{
     NSString *tipStr;
     if (sender.tag == MRPRActionAccept) {//合并
         if (_curMRPRInfo.mrpr.status == MRPRStatusCannotMerge) {//不能合并
-            tipStr =
-            @"呃... \nCoding 不能帮你在线自动合并这个合并请求。";
+            tipStr = @"Coding 不能帮你在线自动合并这个合并请求。";
             kTipAlert(@"%@", tipStr);
         }else{
             MRPRAcceptViewController *vc = [MRPRAcceptViewController new];
diff --git a/Coding_iOS/Models/MRPR.h b/Coding_iOS/Models/MRPR.h
@@ -28,7 +28,7 @@ typedef NS_ENUM(NSInteger, MRPRStatus) {
 @property (assign, nonatomic) BOOL isLoading;
 
 //Post
-@property (assign, nonatomic) BOOL del_source_branch;
+@property (assign, nonatomic) BOOL del_source_branch, can_edit_src_branch;
 @property (strong, nonatomic) NSString *message;
 
 + (MRPR *)mrprWithPath:(NSString *)path;
diff --git a/Coding_iOS/Models/MRPR.m b/Coding_iOS/Models/MRPR.m
@@ -71,8 +71,12 @@ - (NSString *)toAcceptPath{
     return [[self p_prePath] stringByAppendingString:@"merge"];
 }
 - (NSDictionary *)toAcceptParams{
-    return @{@"del_source_branch": _del_source_branch? @"true": @"false",
-             @"message" : _message? _message: @""};
+    if (_can_edit_src_branch) {
+        return @{@"del_source_branch": _del_source_branch? @"true": @"false",
+                 @"message" : _message? _message: @""};
+    }else{
+        return @{@"message" : _message? _message: @""};
+    }
 }
 - (NSString *)toRefusePath{
     return [[self p_prePath] stringByAppendingString:@"refuse"];
