Commit 0d1747d

committed

共有项目没有权限管理,非项目成员也可访问代码相关功能

1 parent a6c9b64 commit 0d1747dCopy full SHA for 0d1747d

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,9 +234,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa`
`234`	`234`	`cellHeight = indexPath.row == 0? [ProjectInfoCell cellHeight]: [ProjectDescriptionCell cellHeightWithObj:_myProject];`
`235`	`235`	`}else if (indexPath.section == 1){`
`236`	`236`	`NSInteger codeNum = _myProject.is_public.boolValue? 2: 4;`
`237`		`- cellHeight = (indexPath.row == codeNum && _myProject.current_user_role_id.integerValue <= 75)? 0: [NProjectItemCell cellHeight];`
	`237`	`+ cellHeight = (indexPath.row == codeNum && !_myProject.is_public.boolValue && _myProject.current_user_role_id.integerValue <= 75)? 0: [NProjectItemCell cellHeight];`
`238`	`238`	`}else{`
`239`		`- cellHeight = _myProject.current_user_role_id.integerValue <= 75? 0: [NProjectItemCell cellHeight];`
	`239`	`+ cellHeight = (!_myProject.is_public.boolValue && _myProject.current_user_role_id.integerValue <= 75)? 0: [NProjectItemCell cellHeight];`
`240`	`240`	`}`
`241`	`241`	`return cellHeight;`
`242`	`242`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ - (void)goToVCWithItem:(HtmlMediaItem )clickedItem activity:(ProjectActivity )`
`169`	`169`	`}`
`170`	`170`	`}else if ([proAct.action isEqualToString:@"push"]){`
`171`	`171`	`// current_user_role_id = 75 是受限成员,不可访问代码`
`172`		`- if (project.current_user_role_id.integerValue <= 75) {`
	`172`	`+ if (!project.is_public.boolValue && project.current_user_role_id.integerValue <= 75) {`
`173`	`173`	`[NSObject showHudTipStr:@"无权访问项目代码相关功能"];`
`174`	`174`	`return;`
`175`	`175`	`}`
`@@ -193,7 +193,7 @@ - (void)goToVCWithItem:(HtmlMediaItem )clickedItem activity:(ProjectActivity )`
`193`	`193`	`[target_type isEqualToString:@"MergeRequestBean"] \|\|`
`194`	`194`	`[target_type isEqualToString:@"CommitLineNote"]){`
`195`	`195`	`// current_user_role_id = 75 是受限成员,不可访问代码`
`196`		`- if (project.current_user_role_id.integerValue <= 75) {`
	`196`	`+ if (!project.is_public.boolValue && project.current_user_role_id.integerValue <= 75) {`
`197`	`197`	`[NSObject showHudTipStr:@"无权访问项目代码相关功能"];`
`198`	`198`	`return;`
`199`	`199`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ - (void)goToVCWithItem:(HtmlMediaItem )clickedItem activity:(ProjectActivity )`
`442`	`442`	`}`
`443`	`443`	`}else if ([proAct.action isEqualToString:@"push"]){`
`444`	`444`	`// current_user_role_id = 75 是受限成员,不可访问代码`
`445`		`- if (project.current_user_role_id.integerValue <= 75) {`
	`445`	`+ if (!project.is_public.boolValue && project.current_user_role_id.integerValue <= 75) {`
`446`	`446`	`[NSObject showHudTipStr:@"无权访问项目代码相关功能"];`
`447`	`447`	`return;`
`448`	`448`	`}`
`@@ -466,7 +466,7 @@ - (void)goToVCWithItem:(HtmlMediaItem )clickedItem activity:(ProjectActivity )`
`466`	`466`	`[target_type isEqualToString:@"MergeRequestBean"] \|\|`
`467`	`467`	`[target_type isEqualToString:@"CommitLineNote"]){`
`468`	`468`	`// current_user_role_id = 75 是受限成员,不可访问代码`
`469`		`- if (project.current_user_role_id.integerValue <= 75) {`
	`469`	`+ if (!project.is_public.boolValue && project.current_user_role_id.integerValue <= 75) {`
`470`	`470`	`[NSObject showHudTipStr:@"无权访问项目代码相关功能"];`
`471`	`471`	`return;`
`472`	`472`	`}`

Comments

(0)