bug fix: prevent edit operation when user not logged in
This commit is contained in:
parent
c622fc3f84
commit
abd23f95f6
|
@ -7,8 +7,6 @@
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
2B45383E17A65CBD00649D12 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45383C17A65CBD00649D12 /* Icon.png */; };
|
|
||||||
2B45383F17A65CBD00649D12 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45383D17A65CBD00649D12 /* Icon@2x.png */; };
|
|
||||||
2B45384117A65D7100649D12 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45384017A65D7100649D12 /* Icon.png */; };
|
2B45384117A65D7100649D12 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45384017A65D7100649D12 /* Icon.png */; };
|
||||||
2B45384317A65DD100649D12 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45384217A65DD100649D12 /* Icon@2x.png */; };
|
2B45384317A65DD100649D12 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B45384217A65DD100649D12 /* Icon@2x.png */; };
|
||||||
2B62D0DF1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2B62D0DE1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard */; };
|
2B62D0DF1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2B62D0DE1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard */; };
|
||||||
|
@ -256,10 +254,8 @@
|
||||||
/* End PBXContainerItemProxy section */
|
/* End PBXContainerItemProxy section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
2B45383C17A65CBD00649D12 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
|
2B45384017A65D7100649D12 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../Icon.png; sourceTree = "<group>"; };
|
||||||
2B45383D17A65CBD00649D12 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
|
2B45384217A65DD100649D12 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "../Icon@2x.png"; sourceTree = "<group>"; };
|
||||||
2B45384017A65D7100649D12 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
|
|
||||||
2B45384217A65DD100649D12 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
|
|
||||||
2B62D0DE1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueCreateOrUpdateViewController.storyboard; path = ViewControllers/OZLIssueCreateOrUpdateViewController.storyboard; sourceTree = "<group>"; };
|
2B62D0DE1796498800AC3C19 /* OZLIssueCreateOrUpdateViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueCreateOrUpdateViewController.storyboard; path = ViewControllers/OZLIssueCreateOrUpdateViewController.storyboard; sourceTree = "<group>"; };
|
||||||
2B62D0E0179649A800AC3C19 /* OZLIssueDetailViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueDetailViewController.storyboard; path = ViewControllers/OZLIssueDetailViewController.storyboard; sourceTree = "<group>"; };
|
2B62D0E0179649A800AC3C19 /* OZLIssueDetailViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueDetailViewController.storyboard; path = ViewControllers/OZLIssueDetailViewController.storyboard; sourceTree = "<group>"; };
|
||||||
2B62D0E21796A15C00AC3C19 /* OZLProjectInfoViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLProjectInfoViewController.storyboard; path = ViewControllers/OZLProjectInfoViewController.storyboard; sourceTree = "<group>"; };
|
2B62D0E21796A15C00AC3C19 /* OZLProjectInfoViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLProjectInfoViewController.storyboard; path = ViewControllers/OZLProjectInfoViewController.storyboard; sourceTree = "<group>"; };
|
||||||
|
@ -852,8 +848,6 @@
|
||||||
D5DB804D1792F2BF0081662A = {
|
D5DB804D1792F2BF0081662A = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
2B45384217A65DD100649D12 /* Icon@2x.png */,
|
|
||||||
2B45384017A65D7100649D12 /* Icon.png */,
|
|
||||||
D5DB80761792F3EE0081662A /* Libs */,
|
D5DB80761792F3EE0081662A /* Libs */,
|
||||||
D5DB805F1792F2BF0081662A /* RedmineMobile */,
|
D5DB805F1792F2BF0081662A /* RedmineMobile */,
|
||||||
2BC4DD8F179928C80090F52C /* RedmineMobileUnitTest */,
|
2BC4DD8F179928C80090F52C /* RedmineMobileUnitTest */,
|
||||||
|
@ -903,8 +897,8 @@
|
||||||
D5DB80601792F2BF0081662A /* Supporting Files */ = {
|
D5DB80601792F2BF0081662A /* Supporting Files */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
2B45383C17A65CBD00649D12 /* Icon.png */,
|
2B45384217A65DD100649D12 /* Icon@2x.png */,
|
||||||
2B45383D17A65CBD00649D12 /* Icon@2x.png */,
|
2B45384017A65D7100649D12 /* Icon.png */,
|
||||||
D5DB80611792F2BF0081662A /* RedmineMobile-Info.plist */,
|
D5DB80611792F2BF0081662A /* RedmineMobile-Info.plist */,
|
||||||
D5DB80621792F2BF0081662A /* InfoPlist.strings */,
|
D5DB80621792F2BF0081662A /* InfoPlist.strings */,
|
||||||
D5DB80651792F2BF0081662A /* main.m */,
|
D5DB80651792F2BF0081662A /* main.m */,
|
||||||
|
@ -1300,8 +1294,6 @@
|
||||||
2BEA49BC17A117C3008DBAF9 /* icon_window_lock.png in Resources */,
|
2BEA49BC17A117C3008DBAF9 /* icon_window_lock.png in Resources */,
|
||||||
2BEA49BD17A117C3008DBAF9 /* icon_zoom_in.png in Resources */,
|
2BEA49BD17A117C3008DBAF9 /* icon_zoom_in.png in Resources */,
|
||||||
2BEA49BE17A117C3008DBAF9 /* icon_zoom_out.png in Resources */,
|
2BEA49BE17A117C3008DBAF9 /* icon_zoom_out.png in Resources */,
|
||||||
2B45383E17A65CBD00649D12 /* Icon.png in Resources */,
|
|
||||||
2B45383F17A65CBD00649D12 /* Icon@2x.png in Resources */,
|
|
||||||
2B45384117A65D7100649D12 /* Icon.png in Resources */,
|
2B45384117A65D7100649D12 /* Icon.png in Resources */,
|
||||||
2B45384317A65DD100649D12 /* Icon@2x.png in Resources */,
|
2B45384317A65DD100649D12 /* Icon@2x.png in Resources */,
|
||||||
);
|
);
|
||||||
|
@ -1513,6 +1505,7 @@
|
||||||
INFOPLIST_FILE = "RedmineMobile/RedmineMobile-Info.plist";
|
INFOPLIST_FILE = "RedmineMobile/RedmineMobile-Info.plist";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
TARGETED_DEVICE_FAMILY = 1;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
|
@ -1525,6 +1518,7 @@
|
||||||
INFOPLIST_FILE = "RedmineMobile/RedmineMobile-Info.plist";
|
INFOPLIST_FILE = "RedmineMobile/RedmineMobile-Info.plist";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
TARGETED_DEVICE_FAMILY = 1;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|
|
@ -61,4 +61,6 @@
|
||||||
-(OZLModelIssueStatus*)issueStatusWithId:(int)index;
|
-(OZLModelIssueStatus*)issueStatusWithId:(int)index;
|
||||||
-(OZLModelUser*)userWithId:(int)index;
|
-(OZLModelUser*)userWithId:(int)index;
|
||||||
|
|
||||||
|
+(BOOL) isUserLoggedIn;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -64,6 +64,11 @@ static OZLSingleton* sharedInstance = nil;
|
||||||
return sharedInstance;
|
return sharedInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+(BOOL) isUserLoggedIn
|
||||||
|
{
|
||||||
|
return [[[OZLSingleton sharedInstance] redmineUserName] length] > 0;
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark getter and setter
|
#pragma mark getter and setter
|
||||||
-(NSString*)redmineHomeURL
|
-(NSString*)redmineHomeURL
|
||||||
{
|
{
|
||||||
|
|
|
@ -31,8 +31,12 @@
|
||||||
#import "OZLIssueLogtimeViewController.h"
|
#import "OZLIssueLogtimeViewController.h"
|
||||||
#import "OZLSingleton.h"
|
#import "OZLSingleton.h"
|
||||||
#import "OZLIssueCreateOrUpdateViewController.h"
|
#import "OZLIssueCreateOrUpdateViewController.h"
|
||||||
|
#import "MBProgressHUD.h"
|
||||||
|
|
||||||
@interface OZLIssueDetailViewController ()
|
@interface OZLIssueDetailViewController () {
|
||||||
|
MBProgressHUD * _HUD;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
@ -72,6 +76,11 @@
|
||||||
_startTime.text = _issueData.startDate;
|
_startTime.text = _issueData.startDate;
|
||||||
_dueTime.text = _issueData.dueDate;
|
_dueTime.text = _issueData.dueDate;
|
||||||
|
|
||||||
|
|
||||||
|
_HUD = [[MBProgressHUD alloc] initWithView:self.view];
|
||||||
|
[self.view addSubview:_HUD];
|
||||||
|
_HUD.labelText = @"Loading...";
|
||||||
|
|
||||||
[self.navigationItem setTitle:@"Issue Details"];
|
[self.navigationItem setTitle:@"Issue Details"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,18 +102,42 @@
|
||||||
[self.navigationController pushViewController:history animated:YES];
|
[self.navigationController pushViewController:history animated:YES];
|
||||||
}break;
|
}break;
|
||||||
case 1:{// add sub task
|
case 1:{// add sub task
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
||||||
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
||||||
[creator setParentIssue:_issueData];
|
[creator setParentIssue:_issueData];
|
||||||
[self.navigationController pushViewController:creator animated:YES];
|
[self.navigationController pushViewController:creator animated:YES];
|
||||||
}break;
|
}break;
|
||||||
case 2:{//logtime
|
case 2:{//logtime
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueLogtimeViewController" bundle:nil];
|
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueLogtimeViewController" bundle:nil];
|
||||||
OZLIssueLogtimeViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueLogtimeViewController"];
|
OZLIssueLogtimeViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueLogtimeViewController"];
|
||||||
[creator setIssueData:_issueData];
|
[creator setIssueData:_issueData];
|
||||||
[self.navigationController pushViewController:creator animated:YES];
|
[self.navigationController pushViewController:creator animated:YES];
|
||||||
}break;
|
}break;
|
||||||
case 3:{ // update
|
case 3:{ // update
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
||||||
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
||||||
[creator setIssueData:_issueData];
|
[creator setIssueData:_issueData];
|
||||||
|
|
|
@ -134,9 +134,17 @@
|
||||||
|
|
||||||
-(void)editProjectList:(id)sender
|
-(void)editProjectList:(id)sender
|
||||||
{
|
{
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
[_projectsTableview setEditing:YES animated:YES];
|
[_projectsTableview setEditing:YES animated:YES];
|
||||||
self.navigationItem.rightBarButtonItem = _doneBtn;
|
self.navigationItem.rightBarButtonItem = _doneBtn;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-(void)editProjectListDone:(id)sender
|
-(void)editProjectListDone:(id)sender
|
||||||
|
@ -146,6 +154,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)createProject:(id)sender {
|
- (IBAction)createProject:(id)sender {
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLProjectInfoViewController" bundle:nil];
|
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLProjectInfoViewController" bundle:nil];
|
||||||
OZLProjectInfoViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLProjectInfoViewController"];
|
OZLProjectInfoViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLProjectInfoViewController"];
|
||||||
[creator setProjectList:_projectList];
|
[creator setProjectList:_projectList];
|
||||||
|
|
|
@ -359,6 +359,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)onNewIssue:(id)sender {
|
- (IBAction)onNewIssue:(id)sender {
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
//OZLIssueCreateOrUpdateViewController* creator = [[OZLIssueCreateOrUpdateViewController alloc] initWithNibName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
//OZLIssueCreateOrUpdateViewController* creator = [[OZLIssueCreateOrUpdateViewController alloc] initWithNibName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
||||||
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateOrUpdateViewController" bundle:nil];
|
||||||
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
OZLIssueCreateOrUpdateViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateOrUpdateViewController"];
|
||||||
|
@ -383,6 +391,14 @@
|
||||||
|
|
||||||
-(void)editIssueList:(id)sender
|
-(void)editIssueList:(id)sender
|
||||||
{
|
{
|
||||||
|
if (![OZLSingleton isUserLoggedIn] ) {
|
||||||
|
_HUD.mode = MBProgressHUDModeText;
|
||||||
|
_HUD.labelText = @"No available";
|
||||||
|
_HUD.detailsLabelText = @"You need to log in to do this.";
|
||||||
|
[_HUD show:YES];
|
||||||
|
[_HUD hide:YES afterDelay:2];
|
||||||
|
return;
|
||||||
|
}
|
||||||
[_issuesTableview setEditing:YES animated:YES];
|
[_issuesTableview setEditing:YES animated:YES];
|
||||||
self.navigationItem.rightBarButtonItem = _doneBtn;
|
self.navigationItem.rightBarButtonItem = _doneBtn;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue