MTrack/SCMWorkingCopy.php

diff --git a/MTrack/SCM.php b/MTrack/SCM.php
index 47c2d84..a41799c 100644 (file)
--- a/MTrack/SCM.php
+++ b/MTrack/SCM.php
@@ -251,32 +251,37 @@ abstract class MTrackSCM
     return self::makeDisplayName($this);
   }
 
-  public function resolveRevision($rev, $object, $ident) {
-      if ($rev !== null) {
-        return $rev;
-      }
-      if ($object === null) {
-        return null;
-      }
-      switch ($object) {
-        case 'rev':
-          $rev = $ident;
-          break;
-        case 'branch':
-          $branches = $this->getBranches();
-           $rev = isset($branches[$ident]) ? $branches[$ident] : null;
-          break;
-        case 'tag':
-          $tags = $this->getTags();
-          $rev = isset($tags[$ident]) ? $tags[$ident] : null;
-          break;
-      }
-      if ($rev === null) {
-        throw new Exception(
-          "don't know which revision to use ($rev,$object,$ident)");
-      }
-    return $rev;
-  }
+    public function resolveRevision($rev, $object, $ident)
+    {
+        if ($rev !== null) {
+          return $rev;
+        }
+        
+        if ($object === null) {
+          return null;
+        }
+        
+        switch ($object) {
+            case 'rev':
+                $rev = $ident;
+                break;
+            
+            case 'branch':
+                $branches = $this->getBranches();
+                $rev = isset($branches[$ident]) ? $branches[$ident] : null;
+                break;
+            
+            case 'tag':
+              $tags = $this->getTags();
+              $rev = isset($tags[$ident]) ? $tags[$ident] : null;
+              break;
+        }
+        if ($rev === null) {
+          throw new Exception(
+            "don't know which revision to use ($rev,$object,$ident)");
+        }
+      return $rev;
+    }
 
      
 }

diff --git a/MTrack/SCMWorkingCopy.php b/MTrack/SCMWorkingCopy.php
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/MTrackWeb/templates/timeline.html b/MTrackWeb/templates/timeline.html
index 1696faf..b47d7b8 100644 (file)
--- a/MTrackWeb/templates/timeline.html
+++ b/MTrackWeb/templates/timeline.html
@@ -6,8 +6,8 @@
    {foreach:events,ent}
 
    <li  flexy:if="!ent.id" class="change-log-day">{ent.day}</li>
+   
    <li  flexy:if="ent.id" class="change-log-item">
-       
        <div class='timelineevent'>{link.username(ent.person_id,#no_name=1&size=48&class=timelineface#):h} 
            <div class='timelinetext'>
                <div class='timelinereason'>
@@ -22,3 +22,4 @@
    {end:}
 </ul>
 
+ 
\ No newline at end of file

diff --git a/index.php b/index.php
index 8458589..6f2202d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -18,9 +18,9 @@ new HTML_FlexyFramework(array(
        
     'project' => 'MTrackWeb',
     'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
-    'database'        => 'mysql://root:@localhost/mtrack',
+    'database'        => 'mysql://root:@localhost/pman',
     'DB_DataObject' => array(
-        
+       //  'debug' => 5,
 
         'class_location' => implode(PATH_SEPARATOR, array(
                 dirname(__FILE__). '/Pman/MTrack/DataObjects',