Skip to content

Commit 8287f53

Browse files
committed
修改合并 mr 默认信息
1 parent bd9f23e commit 8287f53

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

Coding_iOS/Controllers/MRPRAcceptViewController.m

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,22 @@ - (void)viewDidLoad{
4141
}
4242
self.curMRPR.message = [NSString stringWithFormat:@"Accept Merge Request #%@ : (%@ -> %@)", _curMRPR.iid.stringValue, fromStr, toStr];
4343

44+
self.curMRPR.message = [NSString stringWithFormat:
45+
@"Accept Merge Request #%@ : %@\n\n\
46+
From -> To: (%@ -> %@)\n\n\
47+
Merge Request: %@\n\n\
48+
Created By: @%@\n\
49+
Accepted By: @%@\n\
50+
URL:%@",
51+
_curMRPR.iid.stringValue,
52+
_curMRPR.title,
53+
fromStr,
54+
toStr,
55+
_curMRPR.title,
56+
_curMRPR.author.name,
57+
[Login curLoginUser].name,
58+
[NSURL URLWithString:_curMRPR.path relativeToURL:[NSURL URLWithString:[NSObject baseURLStr]]].absoluteString];
59+
4460
_myTableView = ({
4561
UITableView *tableView = [[TPKeyboardAvoidingTableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
4662
tableView.backgroundColor = kColorTableSectionBg;

Coding_iOS/Views/Cell/MRPRAcceptEditCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2015年 Coding. All rights reserved.
77
//
88

9-
#define kMRPRAcceptEditCell_TextViewHeight 80.0
9+
#define kMRPRAcceptEditCell_TextViewHeight (kScreen_Height/4)
1010

1111
#import "MRPRAcceptEditCell.h"
1212

0 commit comments

Comments
 (0)