SF.net SVN: ledger-smb:[6824] trunk/LedgerSMB/Scripts/setup.pm

[..hidden..]

Revision: 6824
          http://sourceforge.net/p/ledger-smb/code/6824
Author:   einhverfr
Date:     2014-02-10 09:36:44 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Tentative fix for templates not being loaded into db, bug 1053

Modified Paths:
--------------
    trunk/LedgerSMB/Scripts/setup.pm

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2014-02-10 09:13:57 UTC (rev 6823)
+++ trunk/LedgerSMB/Scripts/setup.pm	2014-02-10 09:36:44 UTC (rev 6824)
@@ -25,6 +25,7 @@
 use LedgerSMB::Upgrade_Tests;
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Template::DB;
+use LedgerSMB::Setting;
 use strict;
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB::Scripts::setup');
@@ -980,10 +981,15 @@
     process_and_run_upgrade_script($request, $database, "lsmb$v",
 				   "$dbinfo->{version}-1.4");
 
-    if ($v eq '1.2'){
-	create_initial_user($request);
+    if ($v ne '1.2'){
+	$request->{only_templates} = 1;
+    }
+    my $templates = LedgerSMB::Setting->get('templates');
+    if ($templates){
+       $request->{template_dir} = $templates;
+       load_templates($request);
     } else {
-	rebuild_modules($request);
+       template_screen($request);
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits