Changeset 789 for apps/iphone

Timestamp:

01/26/11 13:37:09 (2 years ago)

Author:

henri

Message:

Global items should now remain global.
Preparation for allowing modifications of global items.

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• ProfileRecordsViewController.h (modified) (1 diff)
• ProfileRecordsViewController.m (modified) (10 diffs)

apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.h

@@ -57 +57 @@
 - (void)storeTextHeader:(NSString *)newHeader;
 - (void)getRecords;
-- (void)enableRecords;
-- (void)disableRecords;
+- (void)enableRecordsUsingGlobal:(BOOL)isGlobal;
+- (void)disableRecordsUsingGlobal:(BOOL)isGlobal;
 
 - (void)updateEditButtonAndDoNothing:(NSDictionary *)parsedJson;

apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.m

@@ -275 +275 @@
         if (editing) {
                 [self displayDisabledRecords:YES];
-                buttonEditCount = 2;
                 self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
                                                                                                                                                                                            target:self 
@@ -284 +283 @@
                         // Clicked "Done", not "Cancel"
                         // The Cancel leftBarButtonItem button was removed in didClickCancel
+                        buttonEditCount = 4;
                         self.navigationItem.leftBarButtonItem = nil;
-                        [self enableRecords];
+                        [self enableRecordsUsingGlobal:NO];
                         [self getRecords];
                 }
@@ -350 +350 @@
         // 1- that all enable-disable actions are done in serial order
         // 2- that the user cannot re-edit the table before all is done
-        // call enableRecords, and all goes from there automatically
+        // call enableRecordsUsingGlobal:NO, and all goes from there automatically
         if (parsedJson) {
                 [[MyTelConnect sharedInstance] doNothing:parsedJson];
         }
         switch (buttonEditCount) {
-                case 2: // This case should be skipped if you start by calling enableRecords
-                        [self enableRecords];
+                case 4: // This case will be skipped if you start by calling enableRecordsUsingGlobal:NO
+                        [self enableRecordsUsingGlobal:NO];
+                        break;
+                case 3:
+                        [self enableRecordsUsingGlobal:YES];
+                        break;
+                case 2:
+                        [self disableRecordsUsingGlobal:NO];
                         break;
                 case 1:
-                        [self disableRecords];
+                        [self disableRecordsUsingGlobal:YES];
                         break;
                 case 0:
@@ -764 +770 @@
 }
 
-- (void)enableRecords {
+- (void)enableRecordsUsingGlobal:(BOOL)isGlobal {
 //      inputRecords = {
 //      domainName: "cartman.tel",
@@ -778 +784 @@
 //      }; 
 
+        buttonEditCount--;
         NSMutableArray *apiIdArray = [NSMutableArray arrayWithCapacity:[uiArray count]];
         for (NSDictionary *theRow in uiArray) {
-                if ([[theRow valueForKey:@"global"] integerValue] == 1) {
-                                // We don't modify global records
-                                // TODO: Show the user that global records can't be modified
+                if ([[theRow valueForKey:@"global"] integerValue] != isGlobal) {
+                                // We don't modify records that are not what we're asking for: either global or profile-specific
                         continue;
                 }
                 if ([[theRow valueForKey:@"enabled"] integerValue] == 1) {
-                        if ([[theRow valueForKey:@"terminal"] integerValue] == 1) {
-                                // Only handle terminal records
-                                [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
-                        }
+                        [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
                 }
         }
         if ([apiIdArray count] == 0) {
-                buttonEditCount--;
                 [self performSelector:@selector(updateEditButtonAndDoNothing:) withObject:nil];
                 return;
@@ -805 +807 @@
         NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:3] retain];
         [requestData setObject:[self.delegate domain] forKey:@"domainName"];
-        NSArray *profiles = [NSArray arrayWithObject:[self.theProfile objectForKey:@"id"]];
+        NSArray *profiles;
+        if (isGlobal) {
+                profiles = [NSArray arrayWithObject:@"-1"];     // global profile
+        } else {
+                profiles = [NSArray arrayWithObject:[self.theProfile objectForKey:@"id"]];
+        }
         [requestData setObject:profiles forKey:@"profiles"];
                 
@@ -813 +820 @@
         [conn performLookup:TRUE];
         [requestData release];
-        buttonEditCount--;
-}
-
-- (void)disableRecords {
+}
+
+- (void)disableRecordsUsingGlobal:(BOOL)isGlobal {
 //      inputRecords = {
 //      domainName: "cartman.tel",
@@ -830 +836 @@
 //      }; 
 
+        buttonEditCount--;
         NSMutableArray *apiIdArray = [NSMutableArray arrayWithCapacity:[uiArray count]];
         for (NSDictionary *theRow in uiArray) {
-                if ([[theRow valueForKey:@"enabled"] integerValue] == 0) {
-                        if ([[theRow valueForKey:@"terminal"] integerValue] == 1) {
-                                // Only handle terminal records
-                                [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
-                        }
+                if ([[theRow valueForKey:@"global"] integerValue] != isGlobal) {
+                        // We don't modify records that are not what we're asking for: either global or profile-specific
+                        continue;
+                }
+                if ([[theRow valueForKey:@"enabled"] integerValue] == 1) {
+                        [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
                 }
         }
         if ([apiIdArray count] == 0) {
-                buttonEditCount--;
                 [self performSelector:@selector(updateEditButtonAndDoNothing:) withObject:nil];
                 return;
@@ -852 +859 @@
         NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:3] retain];
         [requestData setObject:[self.delegate domain] forKey:@"domainName"];
-        NSArray *profiles = [NSArray arrayWithObject:[self.theProfile objectForKey:@"id"]];
+        NSArray *profiles;
+        if (isGlobal) {
+                profiles = [NSArray arrayWithObject:@"-1"];     // global profile
+        } else {
+                profiles = [NSArray arrayWithObject:[self.theProfile objectForKey:@"id"]];
+        }
         [requestData setObject:profiles forKey:@"profiles"];
                 
@@ -860 +872 @@
         [conn performLookup:TRUE];
         [requestData release];
-        buttonEditCount--;
 }