Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-04-24 21:35:38 +08:00
13 changed files with 3 additions and 144 deletions

View File

@@ -42,7 +42,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
protected String layoutsFolder = viewsFolder + File.separator + "layouts";
protected String binFolder = "bin";
protected String configFolder = "config";
protected String environmentsFolder = configFolder + File.separator + "config";
protected String environmentsFolder = configFolder + File.separator + "environments";
protected String initializersFolder = configFolder + File.separator + "initializers";
protected String localesFolder = configFolder + File.separator + "locales";
protected String dbFolder = "db";
@@ -186,7 +186,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
}
@Override
public String escapeReservedWord(String name) {
public String escapeReservedWord(String name) {
if(this.reservedWordsMappings().containsKey(name)) {
return this.reservedWordsMappings().get(name);
}
@@ -285,7 +285,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
// e.g. DefaultController => defaults_controller.rb
return underscore(name) + "s_controller";
return underscore(name) + "_controller";
}
@Override