GeezerVison is showing github.com — 常用地区&项目权限。。改 · DoomYang/Coding-iOS@5ce0049
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: Coding_iOS/Coding_iOS-Info.plist +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
17 | 17 | <key>CFBundlePackageType</key> |
18 | 18 | <string>APPL</string> |
19 | 19 | <key>CFBundleShortVersionString</key> |
20 | | - <string>3.9</string> |
| 20 | + <string>3.9.5</string> |
21 | 21 | <key>CFBundleSignature</key> |
22 | 22 | <string>????</string> |
23 | 23 | <key>CFBundleURLTypes</key> |
|
36 | 36 | </dict> |
37 | 37 | </array> |
38 | 38 | <key>CFBundleVersion</key> |
39 | | - <string>3.9.201604201040</string> |
| 39 | + <string>3.9.5.201605191700</string> |
40 | 40 | <key>ITSAppUsesNonExemptEncryption</key> |
41 | 41 | <false/> |
42 | 42 | <key>LSApplicationQueriesSchemes</key> |
|
Collapse file
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/CountryCodeListViewController.m +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -104,7 +104,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger |
104 | 104 | UILabel *titleL = [UILabel new]; |
105 | 105 | titleL.font = [UIFont systemFontOfSize:12]; |
106 | 106 | titleL.textColor = [UIColor colorWithHexString:@"0x999999"]; |
107 | | - titleL.text = [_keyList[section+ 1] isEqualToString:@"#"]? @"常用地区": _keyList[section+ 1]; |
| 107 | + titleL.text = [_keyList[section+ 1] isEqualToString:@"#"]? @"常用": _keyList[section+ 1]; |
108 | 108 | [headerV addSubview:titleL]; |
109 | 109 | [titleL mas_makeConstraints:^(MASConstraintMaker *make) { |
110 | 110 | make.edges.equalTo(headerV).insets(UIEdgeInsetsMake(4, 15, 4, 15)); |
|
Collapse file
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m +5-1Lines changed: 5 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -228,11 +228,15 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N |
228 | 228 | } |
229 | 229 |
|
230 | 230 | - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ |
| 231 | +// current_user_role_id = 75 是受限成员,不可访问代码 |
231 | 232 | CGFloat cellHeight = 0; |
232 | 233 | if (indexPath.section == 0) { |
233 | 234 | cellHeight = indexPath.row == 0? [ProjectInfoCell cellHeight]: [ProjectDescriptionCell cellHeightWithObj:_myProject]; |
| 235 | + }else if (indexPath.section == 1){ |
| 236 | + NSInteger codeNum = _myProject.is_public.boolValue? 2: 4; |
| 237 | + cellHeight = (indexPath.row == codeNum && _myProject.current_user_role_id.integerValue <= 75)? 0: [NProjectItemCell cellHeight]; |
234 | 238 | }else{ |
235 | | - cellHeight = [NProjectItemCell cellHeight]; |
| 239 | + cellHeight = _myProject.current_user_role_id.integerValue <= 75? 0: [NProjectItemCell cellHeight]; |
236 | 240 | } |
237 | 241 | return cellHeight; |
238 | 242 | } |
|
Collapse file
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/ProjectMemberListViewController.m +4Lines changed: 4 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -372,6 +372,10 @@ - (void)editAliasOfMember:(ProjectMember *)curMember{ |
372 | 372 | } |
373 | 373 |
|
374 | 374 | - (void)editTypeOfMember:(ProjectMember *)curMember{ |
| 375 | + if (_myProject.is_public.boolValue) { |
| 376 | + [NSObject showHudTipStr:@"公开项目不开放项目权限"]; |
| 377 | + return; |
| 378 | + } |
375 | 379 | __weak typeof(self) weakSelf = self; |
376 | 380 | __weak typeof(curMember) weakMember = curMember; |
377 | 381 | ValueListViewController *vc = [ValueListViewController new]; |
|
Collapse file
Copy file name to clipboardExpand all lines: Coding_iOS/Views/Cell/NProjectItemCell.m +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -50,6 +50,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus |
50 | 50 | [self.rightLabel setHidden:YES]; |
51 | 51 | [self.contentView addSubview:_rightLabel]; |
52 | 52 | } |
| 53 | + self.clipsToBounds = YES; |
53 | 54 | } |
54 | 55 | return self; |
55 | 56 | } |
|