|
@@ -38,7 +38,7 @@
|
|
|
|
|
|
|
|
vc.url_type = URL_REMOTE;
|
|
vc.url_type = URL_REMOTE;
|
|
|
vc.request_url=URL_EDIT;
|
|
vc.request_url=URL_EDIT;
|
|
|
-
|
|
|
|
|
|
|
+ vc.from = indexPath;
|
|
|
vc.delegate = self;
|
|
vc.delegate = self;
|
|
|
vc.params = [[item_json valueForKey:@"params"] mutableCopy];
|
|
vc.params = [[item_json valueForKey:@"params"] mutableCopy];
|
|
|
// vc.params[@"action"] = @"edit";
|
|
// vc.params[@"action"] = @"edit";
|
|
@@ -301,8 +301,8 @@
|
|
|
// NSString* single_select = [item_json valueForKey:@"single_select"];
|
|
// NSString* single_select = [item_json valueForKey:@"single_select"];
|
|
|
// NSString* required =[item_json valueForKey:@"required"];
|
|
// NSString* required =[item_json valueForKey:@"required"];
|
|
|
|
|
|
|
|
- NSString* name = [item_json valueForKey:@"name"];
|
|
|
|
|
- if([name isEqualToString:@"editor"])
|
|
|
|
|
|
|
+// NSString* value = [item_json valueForKey:@"value"];
|
|
|
|
|
+ if([value isEqualToString:@"editor"])
|
|
|
{
|
|
{
|
|
|
// NSDictionary* item_json =((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row];
|
|
// NSDictionary* item_json =((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row];
|
|
|
bool readonly = [[self.content_data_download valueForKey:@"readonly"]boolValue];
|
|
bool readonly = [[self.content_data_download valueForKey:@"readonly"]boolValue];
|
|
@@ -319,15 +319,15 @@
|
|
|
|
|
|
|
|
vc.url_type = URL_REMOTE;
|
|
vc.url_type = URL_REMOTE;
|
|
|
vc.request_url=URL_EDIT;
|
|
vc.request_url=URL_EDIT;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+ vc.from = indexPath;
|
|
|
|
|
+ vc.delegate = self;
|
|
|
vc.params = [[item_json valueForKey:@"params"] mutableCopy];
|
|
vc.params = [[item_json valueForKey:@"params"] mutableCopy];
|
|
|
|
|
|
|
|
[self.navigationController pushViewController:vc animated:NO];
|
|
[self.navigationController pushViewController:vc animated:NO];
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- if([name isEqualToString:@"online_enum"])
|
|
|
|
|
|
|
+ if([value isEqualToString:@"online_enum"])
|
|
|
{
|
|
{
|
|
|
NSString* title = [item_json valueForKey:@"aname"];
|
|
NSString* title = [item_json valueForKey:@"aname"];
|
|
|
|
|
|
|
@@ -389,8 +389,8 @@
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
NSDictionary * item_json = sub_action;
|
|
NSDictionary * item_json = sub_action;
|
|
|
- NSString* name = [item_json valueForKey:@"name"];
|
|
|
|
|
- if([name isEqualToString:@"new"])
|
|
|
|
|
|
|
+ NSString* value = [item_json valueForKey:@"value"];
|
|
|
|
|
+ if([value isEqualToString:@"new"])
|
|
|
{
|
|
{
|
|
|
// AddressEditorViewController * addressVC = [[AddressEditorViewController alloc] initWithNibName:@"CommonEditor.iPad" bundle:nil];
|
|
// AddressEditorViewController * addressVC = [[AddressEditorViewController alloc] initWithNibName:@"CommonEditor.iPad" bundle:nil];
|
|
|
//
|
|
//
|
|
@@ -418,7 +418,7 @@
|
|
|
//
|
|
//
|
|
|
// [self.navigationController pushViewController:addressVC animated:true];
|
|
// [self.navigationController pushViewController:addressVC animated:true];
|
|
|
|
|
|
|
|
- }else if([name isEqualToString:@"online_enum"])
|
|
|
|
|
|
|
+ }else if([value isEqualToString:@"online_enum"])
|
|
|
{
|
|
{
|
|
|
NSString* title = [item_json valueForKey:@"aname"];
|
|
NSString* title = [item_json valueForKey:@"aname"];
|
|
|
|
|
|
|
@@ -454,31 +454,31 @@
|
|
|
[self.navigationController pushViewController:enumvc animated:true];
|
|
[self.navigationController pushViewController:enumvc animated:true];
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-// else if([value isEqualToString:@"Sales_Order_Freight_Bill_To"])
|
|
|
|
|
-// {
|
|
|
|
|
-//
|
|
|
|
|
-//
|
|
|
|
|
-// ContactListViewController* cvc = [[UIStoryboard storyboardWithName:@"ERP_Mobile_Contact" bundle:nil] instantiateViewControllerWithIdentifier:@"ContactListViewController" ];
|
|
|
|
|
-// cvc.showNavibar = true;
|
|
|
|
|
-// cvc.contact_type = value;
|
|
|
|
|
-// cvc.is_subaction = @"true";
|
|
|
|
|
-// cvc.subaction_tag =[NSString stringWithFormat:@"%ld",(long)sender.tag];
|
|
|
|
|
-//
|
|
|
|
|
-//
|
|
|
|
|
-// cvc.returnValue = ^(NSMutableDictionary* value,NSIndexPath* source){
|
|
|
|
|
-//
|
|
|
|
|
-// [self handle_action_return:value indexPath:indexPath action:ACTION_FILL_SECTION];
|
|
|
|
|
-//
|
|
|
|
|
-// //
|
|
|
|
|
-// // if(self.returnValue)
|
|
|
|
|
-// // self.returnValue(value);
|
|
|
|
|
-// };
|
|
|
|
|
-//
|
|
|
|
|
-//
|
|
|
|
|
-//
|
|
|
|
|
-// [self.navigationController pushViewController:cvc animated:true];
|
|
|
|
|
-//
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ else if([value isEqualToString:@"editor"])
|
|
|
|
|
+ {
|
|
|
|
|
+ // NSDictionary* item_json =((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row];
|
|
|
|
|
+ bool readonly = [[self.content_data_download valueForKey:@"readonly"]boolValue];
|
|
|
|
|
+ int disable = [[item_json valueForKey:@"disable"] intValue];
|
|
|
|
|
+ DebugLog(@"TFEditorViewController:: tableView willSelectRowAtIndexPath");
|
|
|
|
|
+
|
|
|
|
|
+ //
|
|
|
|
|
+
|
|
|
|
|
+ if(disable==1||readonly)
|
|
|
|
|
+ return ;
|
|
|
|
|
+
|
|
|
|
|
+ TFEditorViewController *vc = [[UIStoryboard storyboardWithName:@"TFEditor" bundle:nil] instantiateViewControllerWithIdentifier:@"TFEditorViewController"];
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ vc.url_type = URL_REMOTE;
|
|
|
|
|
+ vc.request_url=URL_EDIT;
|
|
|
|
|
+ vc.from = indexPath;
|
|
|
|
|
+ vc.delegate = self;
|
|
|
|
|
+ vc.params = [[item_json valueForKey:@"params"] mutableCopy];
|
|
|
|
|
+
|
|
|
|
|
+ [self.navigationController pushViewController:vc animated:NO];
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
// else if([value isEqualToString:@"Sales_Order_Ship_From"])
|
|
// else if([value isEqualToString:@"Sales_Order_Ship_From"])
|
|
|
// {
|
|
// {
|
|
|
//
|
|
//
|