Merge pull request cfwheels#1314 from cfwheels/hotfix/discussion-1312

Added some missing mappings
MvdO79 · Nov 6, 2023 · e396659 · e396659
2 parents e18ffa9 + 6567e20
commit e396659
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/wheels/events/onabort.cfm b/wheels/events/onabort.cfm
@@ -1,6 +1,6 @@
 <cfscript>
 // public void function onAbort(required targetpage) {
 	$restoreTestRunnerApplicationScope();
-	$include(template = "/app/#application.wheels.eventPath#/onabort.cfm");
+	$include(template = "#application.wheels.eventPath#/onabort.cfm");
 // }
 </cfscript>
diff --git a/wheels/events/onapplicationend.cfm b/wheels/events/onapplicationend.cfm
@@ -1,7 +1,7 @@
 <cfscript>
 // public void function onApplicationEnd(required struct applicationScope) {
 	$include(
-		template = "/app/#arguments.applicationScope.wheels.eventPath#/onapplicationend.cfm",
+		template = "#arguments.applicationScope.wheels.eventPath#/onapplicationend.cfm",
 		argumentCollection = arguments
 	);
 // }

diff --git a/wheels/events/onapplicationstart.cfm b/wheels/events/onapplicationstart.cfm
@@ -261,12 +261,12 @@
 	}
 
 	// Configurable paths from /app
-	application.$wheels.eventPath = "/events";
-	application.$wheels.controllerPath = "/controllers";
-	application.$wheels.modelPath = "/models";
-	application.$wheels.pluginPath = "/plugins";
-	application.$wheels.pluginComponentPath = "/plugins";
-	application.$wheels.viewPath = "/views";
+	application.$wheels.eventPath = "/app/events";
+	application.$wheels.controllerPath = "/app/controllers";
+	application.$wheels.modelPath = "/app/models";
+	application.$wheels.pluginPath = "/app/plugins";
+	application.$wheels.pluginComponentPath = "/app/plugins";
+	application.$wheels.viewPath = "/app/views";
 
 	// Configurable paths from webroot
 	application.$wheels.filePath = "/files";
@@ -966,7 +966,7 @@
 	}
 
 	// Run the developer's on application start code.
-	$include(template = "/app/#application.wheels.eventPath#/onapplicationstart.cfm");
+	$include(template = "#application.wheels.eventPath#/onapplicationstart.cfm");
 
 	// Auto Migrate Database if requested
 	if (application.wheels.enableMigratorComponent && application.wheels.autoMigrateDatabase) {

diff --git a/wheels/events/onerror.cfm b/wheels/events/onerror.cfm
@@ -92,7 +92,7 @@ public string function $runOnError(required exception, required eventName) {
 		} else {
 			$header(statusCode = 500, statusText = "Internal Server Error");
 			local.rv = $includeAndReturnOutput(
-				$template = "/app/#application.wheels.eventPath#/onerror.cfm",
+				$template = "#application.wheels.eventPath#/onerror.cfm",
 				eventName = arguments.eventName,
 				exception = arguments.exception
 			);

diff --git a/wheels/events/onmissingtemplate.cfm b/wheels/events/onmissingtemplate.cfm
@@ -14,7 +14,7 @@ public void function $runOnMissingTemplate(required targetpage) {
 	if (!application.wheels.showErrorInformation) {
 		$header(statusCode = 404, statustext = "Not Found");
 	}
-	$includeAndOutput(template = "/app/#application.wheels.eventPath#/onmissingtemplate.cfm");
+	$includeAndOutput(template = "#application.wheels.eventPath#/onmissingtemplate.cfm");
 	abort;
 }
 </cfscript>
diff --git a/wheels/events/onrequestend.cfm b/wheels/events/onrequestend.cfm
@@ -20,7 +20,7 @@ public void function $runOnRequestEnd(required targetpage) {
 		$debugPoint("requestEnd");
 	}
 	$restoreTestRunnerApplicationScope();
-	$include(template = "/app/#application.wheels.eventPath#/onrequestend.cfm");
+	$include(template = "#application.wheels.eventPath#/onrequestend.cfm");
 	if (application.wheels.showDebugInformation) {
 		$debugPoint("requestEnd,total");
 	}

diff --git a/wheels/events/onrequeststart.cfm b/wheels/events/onrequeststart.cfm
@@ -104,7 +104,7 @@ public void function $runOnRequestStart(required targetPage) {
 			// Set the content to be displayed in maintenance mode to a request variable and exit the function.
 			// This variable is then checked in the Wheels $request function (which is what sets what to render).
 			request.$wheelsAbortContent = $includeAndReturnOutput(
-				$template = "/app/#application.wheels.eventPath#/onmaintenance.cfm"
+				$template = "#application.wheels.eventPath#/onmaintenance.cfm"
 			);
 			return;
 		}
@@ -133,7 +133,7 @@ public void function $runOnRequestStart(required targetPage) {
 			allowMethodsByRoute = application.wheels.accessControlAllowMethodsByRoute
 		);
 	}
-	$include(template = "/app/#application.wheels.eventPath#/onrequeststart.cfm");
+	$include(template = "#application.wheels.eventPath#/onrequeststart.cfm");
 	if (application.wheels.showDebugInformation) {
 		$debugPoint("requestStart");
 	}

diff --git a/wheels/events/onsessionend.cfm b/wheels/events/onsessionend.cfm
@@ -11,6 +11,6 @@
 // }
 
 public void function $runOnSessionEnd(required sessionScope, required applicationScope) {
-	$include(template = "/app/#arguments.applicationScope.wheels.eventPath#/onsessionend.cfm", argumentCollection = arguments);
+	$include(template = "#arguments.applicationScope.wheels.eventPath#/onsessionend.cfm", argumentCollection = arguments);
 }
 </cfscript>
diff --git a/wheels/events/onsessionstart.cfm b/wheels/events/onsessionstart.cfm
@@ -12,6 +12,6 @@
 
 public void function $runOnSessionStart() {
 	$initializeRequestScope();
-	$include(template = "/app/#application.wheels.eventPath#/onsessionstart.cfm");
+	$include(template = "#application.wheels.eventPath#/onsessionstart.cfm");
 }
 </cfscript>
diff --git a/wheels/global/internal.cfm b/wheels/global/internal.cfm
@@ -427,7 +427,7 @@ public void function $abortInvalidRequest() {
 				$header(statusCode = 404, statustext = "Not Found");
 			}
 			if (StructKeyExists(application.wheels, "eventPath")) {
-				$includeAndOutput(template = "/app/#application.wheels.eventPath#/onmissingtemplate.cfm");
+				$includeAndOutput(template = "#application.wheels.eventPath#/onmissingtemplate.cfm");
 			}
 		}
 		$header(statusCode = 404, statustext = "Not Found");