Merge branch 'master' of /home/git/private/web.mtrack

[web.mtrack] / MTrackWeb.php

diff --git a/MTrackWeb.php b/MTrackWeb.php
index 36c9f26..e7366c6 100644 (file)
--- a/MTrackWeb.php
+++ b/MTrackWeb.php
@@ -157,7 +157,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
             $ar = $p->fetchAll('id', 'name');
         } else {
             //DB_DAtaObject::debugLevel(1);
-            $p->applyFilters(array(), $this->authUser);
+            $p->applyFilters(array(), $this->authUser, $this);
             if (!$this->authUser->hasPerm('Core.Projects_All', 'S')) { 
                 $p->whereAdd("Projects.id in (SELECT ProjectDirectory.project_id FROM ProjectDirectory WHERE
                         person_id = ". $this->authUser->id . " and role != '')");
@@ -223,13 +223,17 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         
         $this->loadProjectList();
         
-        $p = $this->currentProject();
+        
+        $p = DB_DataObject::factory('Projects');
+        $p->get($this->currentProject());
+        $this->currentProject = $p; /// mix up?
         
         
         
         if (!$this->authUser) {
             return true; // we do allow people in this far..
         }
+        // very public??
         $this->authUserArray = $this->authUser->toArray();
         unset($this->authUserArray['passwd']);
          
@@ -250,7 +254,8 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         // 
         
         
-        
+        HTML_FlexyFramework::get()->generateDataobjectsCache();
+
         
         if (!empty($loc)) {
             die ("invalid location". htmlspecialchars($loc));
@@ -293,50 +298,14 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     
     function registerClasses()
     {
-        require_once 'MTrack/Wiki.php';
-        require_once 'MTrack/Wiki/Item.php';
-      //  require_once 'MTrack/Milestone.php';
-  
-        
+        // wiki rendering is done client side...
+        // require_once 'MTrack/Wiki/HTMLFormatter.php';
         require_once 'MTrackWeb/LinkHandler.php';
-        require_once 'MTrack/Wiki/HTMLFormatter.php';
-        
         $this->link = new MTrackWeb_LinkHandler();
-        MTrack_Wiki_HTMLFormatter::registerLinkHandler($this->link);
+        //MTrack_Wiki_HTMLFormatter::registerLinkHandler($this->link);
  
-
-        $r = DB_DataObject::factory('mtrack_repos');
-        $r->loadFromPath('default/wiki');
-        MTrack_Wiki_Item::$repo = $r->impl();
-        
-        
-        
-        //MTrack_Wiki::register_macro('MilestoneSummary', array('MTrack_Milestone', 'macro_MilestoneSummary'));
-       // MTrack_Wiki::register_macro('BurnDown', array('MTrack_Milestone', 'macro_BurnDown'));
-        //MTrack_Wiki::register_macro('RunReport', array('MTrack_Report', 'macro_RunReport')); << fixme how are we to hanlde this..
-        //MTrack_Wiki::register_macro('TicketQuery', array('MTrack_Report', 'macro_TicketQuery'));
-        MTrack_Wiki::register_macro('IncludeWikiPage', array('MTrack_Wiki', 'macro_IncludeWiki'));
-        MTrack_Wiki::register_macro('IncludeHelpPage', array('MTrack_Wiki', 'macro_IncludeHelp'));
-        MTrack_Wiki::register_macro('Comment', array('MTrack_Wiki', 'macro_comment'));
-        MTrack_Wiki::register_processor('comment', array('MTrack_Wiki', 'processor_comment'));
-        MTrack_Wiki::register_processor('html', array('MTrack_Wiki', 'processor_html'));
-        MTrack_Wiki::register_processor('dataset', array('MTrack_Wiki', 'processor_dataset'));
-
+        return;
  
-        //MTrackSearchDB::register_indexer('ticket', array('MTrackIssue', 'index_issue'));
-        //MTrackSearchDB::register_indexer('wiki', array('MTrack_Wiki_Item', 'index_item'));
-
-
-
-        //MTrackWatch::registerEventTypes('ticket', array( 'ticket' => 'Tickets' ));
-        //MTrackWatch::registerEventTypes('milestone', array( 'ticket' => 'Tickets', 'changeset' => 'Code changes' ));
-        //MTrackWatch::registerEventTypes('repo', array( 'ticket' => 'Tickets', 'changeset' => 'Code changes' ));
-
-        // should this get registered here??
-        //MTrackCommitChecker::addCheck('Wiki');
-        
-        
-        
    }
     
     function favicon()