mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sms_action

Browse Source
This commit is contained in:
Kevin G Christiano 2021-03-30 15:53:49 -04:00
commit 910fbe7e32
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
View File

@ -71,7 +71,7 @@
if (alternateBase) { if (alternateBase) {
self.alternateBaseURL = [NSURL URLWithString:alternateBase]; self.alternateBaseURL = [NSURL URLWithString:alternateBase];
} }
NSString *url = [actionMap string:@"URL"]; NSString *url = [actionMap string:@"requestURL"];
if (url) { if (url) {
self.URL = [NSURL URLWithString:url]; self.URL = [NSURL URLWithString:url];
} }

2
MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift
View File

@ -17,7 +17,7 @@
public var pageType: String public var pageType: String
public var baseURL: String? public var baseURL: String?
public var appContext: String? public var appContext: String?
public var URL: String? public var requestURL: String?
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
public var presentationStyle: String? public var presentationStyle: String?