Skip to content

Commit 72749f0

Browse files
committed
Default templates
Embedded the default templates in the cfwheels-cli for a new architecture and also integrated it with cfwheels.
1 parent 7ac3c4c commit 72749f0

4 files changed

Lines changed: 30 additions & 5 deletions

File tree

commands/wheels/generate/controller.cfc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@ component
5555
actionContent = allactions;
5656
} else {
5757
// Do Crud: overrwrite whole controllerContent with CRUD template
58-
controllerContent = fileRead( getTemplate( '/CRUDContent.txt' ) );
58+
if(fileExists(fileSystemUtil.resolvePath('app/snippets/CRUDContent.txt'))){
59+
controllerContent = fileRead(fileSystemUtil.resolvePath('app/snippets/CRUDContent.txt'));
60+
}
61+
else{
62+
controllerContent = fileRead( getTemplate( '/CRUDContent.txt' ) );
63+
}
5964
print.yellowLine( 'Generating CRUD' );
6065
}
6166

commands/wheels/generate/model.cfc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ component aliases='wheels g model' extends="../base" {
4444
}
4545

4646
// Read in Template
47-
var modelContent = fileRead( getTemplate('/ModelContent.txt'));
47+
if(fileExists(fileSystemUtil.resolvePath('app/snippets/ModelContent.txt'))){
48+
var modelContent = fileRead(fileSystemUtil.resolvePath('app/snippets/ModelContent.txt'));
49+
}
50+
else{
51+
var modelContent = fileRead( getTemplate('/ModelContent.txt'));
52+
}
4853
var modelName = obj.objectNameSingularC & ".cfc";
4954
var modelPath = directory & "/" & modelName;
5055

commands/wheels/generate/test.cfc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ component aliases='wheels g test' extends="../base" {
7171
}
7272

7373
// Get test content
74-
var testContent= fileRead(getTemplate("tests/#type#.txt"));
74+
if(fileExists(fileSystemUtil.resolvePath('app/snippets/tests/#type#.txt'))){
75+
var testContent= fileRead(fileSystemUtil.resolvePath('app/snippets/tests/#type#.txt'));
76+
}
77+
else{
78+
var testContent= fileRead(getTemplate("tests/#type#.txt"));
79+
}
7580
file action='write' file='#testPath#' mode ='777' output='#trim( testContent )#';
7681
print.line( 'Created Test Stub #testPath#' );
7782
}

commands/wheels/generate/view.cfc

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,19 @@ component aliases='wheels g view' extends="../base" {
4646
// Read in Template
4747
var viewContent = "";
4848
if(!len(arguments.template)){
49-
viewContent = fileRead( getTemplate( '/viewContent.txt'));
49+
if(fileExists(fileSystemUtil.resolvePath('app/snippets/viewContent.txt'))){
50+
viewContent = fileRead(fileSystemUtil.resolvePath('app/snippets/viewContent.txt'));
51+
}
52+
else{
53+
viewContent = fileRead( getTemplate( '/viewContent.txt'));
54+
}
5055
} else {
51-
viewContent = fileRead( getTemplate( arguments.template & '.txt'));
56+
if(fileExists(fileSystemUtil.resolvePath('app/snippets/' & arguments.template & '.txt'))){
57+
viewContent = fileRead(fileSystemUtil.resolvePath('app/snippets/' & arguments.template & '.txt'));
58+
}
59+
else{
60+
viewContent = fileRead( getTemplate( arguments.template & '.txt'));
61+
}
5262
}
5363
// Replace Object tokens
5464
viewContent=$replaceDefaultObjectNames(viewContent, obj);

0 commit comments

Comments
 (0)