From: Alan Knowles <alan@roojs.com>
Date: Tue, 11 Oct 2016 05:02:22 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=c8fb8d0826549de5e56bbe599eaf3d0c47cbfa61;hp=-c;p=web.mtrack

sync
---

c8fb8d0826549de5e56bbe599eaf3d0c47cbfa61
diff --combined index.php
index b90cdb0d,d0625fcb..ae718656
--- a/index.php
+++ b/index.php
@@@ -17,33 -17,25 +17,29 @@@ ini_set('display_errors', true)
  new HTML_FlexyFramework(array(
  	
      'project' => 'MTrackWeb',
-     'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
+     'enable' => 'MTrack,CoreBC,Core,Admin', // enable permissions from Pman 
      'database'        => 'mysql://root:@localhost/pman',
      'version' => '2.0',
-     
      'DB_DataObject' => array(
-        //  'debug' => 5,
+ //         'debug' => 5,
+ 
          'class_location' => implode(PATH_SEPARATOR, array(
                  dirname(__FILE__). '/Pman/MTrack/DataObjects',
+                 dirname(__FILE__). '/Pman/CoreBC/DataObjects',
                  dirname(__FILE__). '/Pman/Core/DataObjects',
                  
          )),
-         'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_DataObjects_:',
+         'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_CoreBC_DataObjects_:Pman_Core_DataObjects_:',
          
-         'ini_mtrack' => implode(PATH_SEPARATOR, array(
-                 dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
-                 dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
-                 
-         )),
 -        //'ini_mtrack' => implode(PATH_SEPARATOR, array(
 -        //        dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
 -        //        dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
 -        //        
 -        //)),
 +         'table_alias' => array(
 +            'core_person' => 'Person',
 +            'core_company' => 'Companies',
 +            'core_group_member' => 'group_members',
 +            'core_group_right' => 'group_rights',
 +            'core_group' => 'Groups',
 +            'core_office' => 'Office',
 +            'core_project' => 'Projects',
 +        )
      ),
      'MTrackWeb' => array(
          'working_dir' => '/var/lib/mtrack', // this needs to be writable by web user..
@@@ -60,7 -52,7 +56,7 @@@
           'useroo' => true,
      ),
       'Pman_Core' => array(
-         'jspacker' => '/home/alan/gitlive/gnome.introspection-doc-generator',
+         'jspacker' => '/home/gitlive/gnome.introspection-doc-generator',
          'cssminify' => dirname(__FILE__).'/roojs1/buildSDK/cssminify.js',
      )
  ));