Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change for git and report.

Browse Source
This commit is contained in:
wangyidong
2015-07-30 09:03:58 +08:00
parent 09aa6eb818
commit bc45adf37c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/git/model.php
+2 -2
View File
@@ -406,7 +406,7 @@ class gitModel extends model
chdir($repo->path);
$subPath = substr($path, strlen($repo->path) + 1);
$subPath = ltrim(DIRECTORY_SEPARATOR, $subPath);
$subPath = ltrim('/', $subPath);
exec("$this->client rev-list -n 2 $revision -- $subPath", $lists);
if(count($lists) == 2) list($nowRevision, $preRevision) = $lists;
$cmd = "$this->client diff $preRevision $nowRevision -- $subPath";
@@ -437,7 +437,7 @@ class gitModel extends model
$path = str_replace('%5C', '\\', $path);
$subPath = substr($path, strlen($repo->path) + 1);
$subPath = ltrim(DIRECTORY_SEPARATOR, $subPath);
$subPath = ltrim('/', $subPath);
chdir($repo->path);
$cmd = "$this->client show $revision:$subPath";
$code = `$cmd`;
module/report/view/blockreportlist.html.php
+1 -1
View File
@@ -9,7 +9,7 @@
$list .= '|';
list($label, $module, $method, $params) = explode('|', $list);
$class = $label == $title ? ' active' : '';
echo html::a($this->createLink($module, $method, $params), "<i class='icon-bar-chart'></i> " . $label, '', "class='list-group-item $class'");
echo html::a($this->createLink($module, $method, $params), $label, '', "class='list-group-item $class'");
}
?>
</ul>