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

Merge branch 'master' of git@github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wyd621
2013-09-02 16:51:23 +08:00
parent eed85d018c ca7adf965c
commit a48a853fca
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/init.bat
+15 -5
View File
@@ -67,12 +67,21 @@ echo checkdb.bat ok
:: create syncsvn.bat
if %requestType% == 'PATH_INFO' (
SET svnrun= %phpcli% %baseDir%ztcli "%pmsRoot%/svn-run"
SET syncsvn= %phpcli% %baseDir%ztcli "%pmsRoot%/svn-run"
)else (
SET svnrun= %phpcli% %baseDir%ztcli "%pmsRoot%/?m=svn&f=run"
SET syncsvn= %phpcli% %baseDir%ztcli "%pmsRoot%/?m=svn&f=run"
)
echo %svnrun% > %baseDir%svnrun.bat
echo svnrun.bat ok
echo %syncsvn% > %baseDir%syncsvn.bat
echo syncsvn.bat ok
:: create syncgit.bat
if %requestType% == 'PATH_INFO' (
SET syncgit= %phpcli% %baseDir%ztcli "%pmsRoot%/git-run"
)else (
SET syncgit= %phpcli% %baseDir%ztcli "%pmsRoot%/?m=git&f=run"
)
echo %syncgit% > %baseDir%syncgit.bat
echo syncgit.bat ok
:: create crond.bat
SET cron= %phpcli% %baseDir%php\crond.php
@@ -86,7 +95,8 @@ echo #min hour day month week command. >> %sysCron%
echo 0 1 * * * %baseDir%dailyreminder.bat # daily reminder. >> %sysCron%
echo 1 1 * * * %baseDir%backup.bat # backup database and file. >> %sysCron%
echo 1 23 * * * %baseDir%computeburn.bat # compute burndown chart. >> %sysCron%
echo 1-59/2 * * * * %baseDir%svnrun.bat # sync subversion. >> %sysCron%
echo 1-59/2 * * * * %baseDir%syncsvn.bat # sync subversion. >> %sysCron%
echo 1-59/2 * * * * %baseDir%syncgit.bat # sync git. >> %sysCron%
:: return 0 when success.
exit /b 0
bin/init.sh
+10
View File
@@ -91,6 +91,15 @@ fi
echo $syncsvn > $basePath/syncsvn.sh
echo "syncsvn.sh ok"
# syncgit.
if [ $requestType == 'PATH_INFO' ]; then
syncgit="$phpcli $basePath/ztcli '$pmsRoot/git-run'";
else
syncgit="$phpcli $basePath/ztcli '$pmsRoot/?m=git&f=run'";
fi
echo $syncgit > $basePath/syncgit.sh
echo "syncgit.sh ok"
# cron
if [ ! -d "$basePath/cron" ]; then
mkdir $basePath/cron
@@ -101,6 +110,7 @@ echo "0 1 * * * $basePath/dailyreminder.sh # dailyreminder."
echo "1 1 * * * $basePath/backup.sh # backup database and file." >> $basePath/cron/sys.cron
echo "1 23 * * * $basePath/computeburn.sh # compute burndown chart." >> $basePath/cron/sys.cron
echo "1-59/2 * * * * $basePath/syncsvn.sh # sync subversion." >> $basePath/cron/sys.cron
echo "1-59/2 * * * * $basePath/syncgit.sh # sync git" >> $basePath/cron/sys.cron
cron="$phpcli $basePath/php/crond.php"
echo $cron > $basePath/cron.sh
echo "cron.sh ok"
module/bug/js/common.js
+3 -3
View File
@@ -36,8 +36,8 @@ function loadAll(productID)
if(!changeProductConfirmed)
{
firstChoice = confirm(confirmChangeProduct);
changeProductConfirmed = true; // Only notice the user one time.
firstChoice = confirm(confirmChangeProduct);
changeProductConfirmed = true; // Only notice the user one time.
}
if(changeProductConfirmed || firstChoice)
{
@@ -221,7 +221,7 @@ function notice()
{
if($('#project').val() == '')
{
$('#buildBox').append('<a href="' + createLink('release', 'create','productID=' + $('#product').val()) + '" target="_blank">' + createRelease + '</a>');
$('#buildBox').append('<a href="' + createLink('release', 'create','productID=' + $('#product').val()) + '" target="_blank">' + createRelease + ' </a>');
$('#buildBox').append('<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>');
}
else
module/git/config.php
+2 -2
View File
@@ -10,12 +10,12 @@
*
* 例子：
* $config->git->client = '/usr/bin/git'; // c:\git\git.exe
* $config->git->repos['pms']['path'] = '/home/user/repo/pms'; // c:\repo\pms
* $config->git->repos['pms']['path'] = '/home/user/repo/pms'; // c:\repo\pms
*
*/
$config->git = new stdClass();
$config->git->encodings = 'utf-8, gbk';
$config->git->client = '/usr/bin/git';
$config->git->client = '';
$i = 1;
$config->git->repos[$i]['path'] = '';