# HG changeset patch # User Sylvain Thénault # Date 1273649393 -7200 # Node ID 513af9be9e370ea65daea24558829450c2d97d6c # Parent 3679015c0a50bfaae650115476f4a5098b617d22 [config] rename remaining inputlevel to level in option definitions, as expected by lgc >= 0.50 diff -r 3679015c0a50 -r 513af9be9e37 goa/goaconfig.py --- a/goa/goaconfig.py Tue May 11 16:58:35 2010 +0200 +++ b/goa/goaconfig.py Wed May 12 09:29:53 2010 +0200 @@ -51,25 +51,25 @@ {'type' : 'csv', 'default': [], 'help': 'list of db model based cubes used by the instance.', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ('included-yams-cubes', {'type' : 'csv', 'default': [], 'help': 'list of yams based cubes used by the instance.', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ('use-google-auth', {'type' : 'yn', 'default': True, 'help': 'does this instance rely on google authentication service or not.', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ('schema-type', {'type' : 'choice', 'choices': ('yams', 'dbmodel'), 'default': 'yams', 'help': 'does this instance is defining its schema using yams or db model.', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), # overriden options ('query-log-file', @@ -78,7 +78,7 @@ 'help': 'web instance query log file: DON\'T SET A VALUE HERE WHEN ' 'UPLOADING YOUR INSTANCE. This should only be used to analyse ' 'queries issued by your instance in the development environment.', - 'group': 'main', 'inputlevel': 2, + 'group': 'main', 'level': 2, }), ('anonymous-user', {'type' : 'string', @@ -87,7 +87,7 @@ '(if you want to allow anonymous). This option will be ignored if ' 'use-google-auth option is set (in which case you should control ' 'anonymous access using the app.yaml file)', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ) + WebConfiguration.options + ServerConfiguration.options) diff -r 3679015c0a50 -r 513af9be9e37 server/sources/native.py --- a/server/sources/native.py Tue May 11 16:58:35 2010 +0200 +++ b/server/sources/native.py Wed May 12 09:29:53 2010 +0200 @@ -235,7 +235,7 @@ 'default': '', 'help': 'set to "Trusted_Connection" if you are using SQLServer and ' 'want trusted authentication for the database connection', - 'group': 'native-source', 'inputlevel': 2, + 'group': 'native-source', 'level': 2, }), ) diff -r 3679015c0a50 -r 513af9be9e37 web/webconfig.py --- a/web/webconfig.py Tue May 11 16:58:35 2010 +0200 +++ b/web/webconfig.py Wed May 12 09:29:53 2010 +0200 @@ -131,7 +131,7 @@ 'help': "duration of the cookie used to store session identifier. " "If 0, the cookie will expire when the user exist its browser. " "Should be 0 or greater than repository\'s session-time.", - 'group': 'web', 'inputlevel': 2, + 'group': 'web', 'level': 2, }), ('cleanup-session-time', {'type' : 'time',