Fixes #13984 custom python init function config is lost in master

elpaso · elpaso · commit 8c4d81023b24 · 2015-12-14T13:55:11.000+01:00
diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
@@ -140,8 +140,8 @@ void QgsEditFormConfig::readXml( const QDomNode& node )
   if ( dotPos >= 0 ) // It's a module
   {
     setInitCodeSource( QgsEditFormConfig::CodeSourceDialog );
-    setInitFunction( mInitFunction.mid( dotPos + 1 ) );
     setInitCode( QString( "from %1 import %2\n" ).arg( mInitFunction.left( dotPos ), mInitFunction.mid( dotPos + 1 ) ) );
+    setInitFunction( mInitFunction.mid( dotPos + 1 ) );
   }
 
   QDomNode editFormInitFilePathNode = node.namedItem( "editforminitfilepath" );

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ void QgsEditFormConfig::readXml( const QDomNode& node )`
`140`	`140`	`if ( dotPos >= 0 ) // It's a module`
`141`	`141`	`{`
`142`	`142`	`setInitCodeSource( QgsEditFormConfig::CodeSourceDialog );`
`143`		`- setInitFunction( mInitFunction.mid( dotPos + 1 ) );`
`144`	`143`	`setInitCode( QString( "from %1 import %2\n" ).arg( mInitFunction.left( dotPos ), mInitFunction.mid( dotPos + 1 ) ) );`
	`144`	`+ setInitFunction( mInitFunction.mid( dotPos + 1 ) );`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`QDomNode editFormInitFilePathNode = node.namedItem( "editforminitfilepath" );`