@ 某人

wanghengheng · wanghengheng · commit 5faa1a7c980d · 2015-06-10T11:02:15.000+08:00
diff --git a/Coding_iOS/Controllers/CommitFilesViewController.m b/Coding_iOS/Controllers/CommitFilesViewController.m
@@ -91,6 +91,8 @@ - (void)refresh{
         _curProject = [Project new];
         _curProject.owner_user_name = _ownerGK;
         _curProject.name = _projectName;
+    }
+    if (![_curProject.id isKindOfClass:[NSNumber class]]) {
         [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curProject andBlock:^(id data, NSError *error) {
             if (data) {
                 weakSelf.curProject = data;
diff --git a/Coding_iOS/Controllers/MRPRDetailViewController.m b/Coding_iOS/Controllers/MRPRDetailViewController.m
@@ -165,6 +165,8 @@ - (void)refresh{
         _curProject = [Project new];
         _curProject.owner_user_name = _curMRPR.des_owner_name;
         _curProject.name = _curMRPR.des_project_name;
+    }
+    if (![_curProject.id isKindOfClass:[NSNumber class]]) {
         [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curProject andBlock:^(id data, NSError *error) {
             if (data) {
                 weakSelf.curProject = data;
diff --git a/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.h b/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.h
@@ -11,5 +11,4 @@
 
 @interface NProjectViewController : BaseViewController
 @property (nonatomic, strong) Project *myProject;
-@property (nonatomic, assign) BOOL needUpdateVisit;
 @end
diff --git a/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m b/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m
@@ -248,7 +248,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
 #pragma mark goTo VC
 - (void)goToIndex:(NSInteger)index{
-    if (index == 0) {
+    if (index == 0 && _myProject.current_user_role_id.integerValue >= 80) {
         __weak typeof(self) weakSelf = self;
         [[Coding_NetAPIManager sharedManager] request_Project_UpdateVisit_WithObj:_myProject andBlock:^(id data, NSError *error) {
             if (data) {
diff --git a/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m
@@ -192,7 +192,6 @@ -(void)gotoNewProject{
 - (void)goToProject:(Project *)project{
     Projects *curPros = [_myProjectsDict objectForKey:[NSNumber numberWithUnsignedInteger:_myCarousel.currentItemIndex]];
     NProjectViewController *vc = [[NProjectViewController alloc] init];
-    vc.needUpdateVisit = (curPros.type < ProjectsTypeTaProject);
     vc.myProject = project;
     [self.navigationController pushViewController:vc animated:YES];
 }
diff --git a/Coding_iOS/Models/Project.h b/Coding_iOS/Models/Project.h
@@ -9,8 +9,8 @@
 #import <Foundation/Foundation.h>
 
 @interface Project : NSObject
-@property (readwrite, nonatomic, strong) NSString *icon, *name, *owner_user_name, *backend_project_path, *full_name, *description_mine, *path, *parent_depot_path;
-@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin;
+@property (readwrite, nonatomic, strong) NSString *icon, *name, *owner_user_name, *backend_project_path, *full_name, *description_mine, *path, *parent_depot_path, *current_user_role;
+@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin, *current_user_role_id;
 @property (assign, nonatomic) BOOL isStaring, isWatching, isLoadingMember, isLoadingDetail;
 
 + (Project *)project_All;
diff --git a/Coding_iOS/Models/Project.m b/Coding_iOS/Models/Project.m
@@ -84,7 +84,11 @@ -(NSDictionary *)toDeleteParamsWithPassword:(NSString *)password{
 }
 
 - (NSString *)toMembersPath{
-    return [NSString stringWithFormat:@"api/project/%d/members", self.id.intValue];
+    if ([_id isKindOfClass:[NSNumber class]]) {
+        return [NSString stringWithFormat:@"api/project/%d/members", self.id.intValue];
+    }else{
+        return [NSString stringWithFormat:@"api/user/%@/project/%@/members", _owner_user_name, _name];
+    }
 }
 - (NSDictionary *)toMembersParams{
     return @{@"page" : [NSNumber numberWithInteger:1],

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,6 @@ -(void)gotoNewProject{`
`192`	`192`	`- (void)goToProject:(Project *)project{`
`193`	`193`	`Projects *curPros = [_myProjectsDict objectForKey:[NSNumber numberWithUnsignedInteger:_myCarousel.currentItemIndex]];`
`194`	`194`	`NProjectViewController *vc = [[NProjectViewController alloc] init];`
`195`		`- vc.needUpdateVisit = (curPros.type < ProjectsTypeTaProject);`
`196`	`195`	`vc.myProject = project;`
`197`	`196`	`[self.navigationController pushViewController:vc animated:YES];`
`198`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,11 @@ -(NSDictionary )toDeleteParamsWithPassword:(NSString )password{`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`- (NSString *)toMembersPath{`
`87`		`- return [NSString stringWithFormat:@"api/project/%d/members", self.id.intValue];`
	`87`	`+ if ([_id isKindOfClass:[NSNumber class]]) {`
	`88`	`+ return [NSString stringWithFormat:@"api/project/%d/members", self.id.intValue];`
	`89`	`+ }else{`
	`90`	`+ return [NSString stringWithFormat:@"api/user/%@/project/%@/members", _owner_user_name, _name];`
	`91`	`+ }`
`88`	`92`	`}`
`89`	`93`	`- (NSDictionary *)toMembersParams{`
`90`	`94`	`return @{@"page" : [NSNumber numberWithInteger:1],`