X-Git-Url: http://git.roojs.org/?p=web.mtrack;a=blobdiff_plain;f=MTrackWeb.php;h=27a511ae2f058cbea1d945b315c9d0afe0b9ed84;hp=29958704abc0db6575cddf6f624cb341aa8e6eef;hb=HEAD;hpb=9a22b479bb29e58b0cb8e06dadbbf337e6f4b5e2

diff --git a/MTrackWeb.php b/MTrackWeb.php
index 29958704..03e3c3c2 100644
--- a/MTrackWeb.php
+++ b/MTrackWeb.php
@@ -10,6 +10,8 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     var $priorities = array();
     var $severities = array();
     var $link = false; // the link handler..
+    var $authUser;
+    var $currentProject;
     
     function hasPerm($what, $cando) {
         // our whole perm logic sits in here....
@@ -111,7 +113,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         
         
         $ar = $this->userProjects();
-        //print_r($ar);
+         
         if (!isset($ar[$currentProject])) {
             $currentProject = false;
             $_SESSION[__CLASS__]['active_project_id'] = false;
@@ -126,7 +128,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         if (empty($currentProject))    {
             
         
-            //$p = DB_DataObject::factory('Projects');
+            //$p = DB_DataObject::factory('core_project');
             //$p->get('code', '*PUBLIC');
             $id = 0;
             foreach($ar as $k=>$v) {
@@ -156,16 +158,20 @@ class MTrackWeb extends HTML_FlexyFramework_Page
            
             $ar = $p->fetchAll('id', 'name');
         } else {
-            //DB_DAtaObject::debugLevel(1);
+            
+           // DB_DAtaObject::debugLevel(1);
             $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 != '')");
             }
+            /*
+             * SOME PROJECTS MIGHT NOT HAVE REPO's...
             $p->whereAdd('id in (SELECT distinct(project_id) FROM mtrack_repos)');
+            */
             // $pd->whereAdd("role != ''");
             
-            $p->orderBy('Projects.name ASC');
+            $p->orderBy('core_project.name ASC');
             unset($p->client_id); // default projects serach enforces this..
             $ar = $p->fetchAll('id', 'name');
         }
@@ -192,7 +198,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     
     function getAuthUser()
     {
-        $u = DB_DataObject::factory('core_project');
+        $u = DB_DataObject::factory('core_person');
         if (!$u->isAuth()) {
             return false;
         }
@@ -224,7 +230,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         $this->loadProjectList();
         
         
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         $p->get($this->currentProject());
         $this->currentProject = $p; /// mix up?
         
@@ -272,7 +278,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         return HTML_FlexyFramework::run('Wiki/Today'); 
  
     }
-    function post()
+    function post($request)
     {
         header("Status: 404 Not Found");
         die("invalid post request? ");