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

* Adjust code for tab to space.

Browse Source
This commit is contained in:
pengjiangxiu
2017-08-17 11:26:42 +08:00
parent 9e34e50947
commit e28ceee2d9
8 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/control.php
+46 -46
View File
@@ -32,52 +32,52 @@ class admin extends control
$this->view->ignore = false;
}
$this->app->loadLang('misc');
$this->app->loadLang('misc');
$this->view->title = $this->lang->admin->common;
$this->view->position[] = $this->lang->admin->index;
$this->display();
$this->display();
}
/**
* Ignore notice of register and bind.
*
* @access public
* @return void
*/
public function ignore()
{
$this->loadModel('setting');
$this->setting->deleteItems('owner=system&module=common&section=global&key=community');
$this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
$this->setting->setItem('system.common.global.community', 'na');
die(js::locate(inlink('index'), 'parent'));
}
/**
* Ignore notice of register and bind.
*
* @access public
* @return void
*/
public function ignore()
{
$this->loadModel('setting');
$this->setting->deleteItems('owner=system&module=common&section=global&key=community');
$this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
$this->setting->setItem('system.common.global.community', 'na');
die(js::locate(inlink('index'), 'parent'));
}
/**
* Register zentao.
*
* @access public
* @return void
*/
public function register($from = 'admin')
{
if($_POST)
{
$response = $this->admin->registerByAPI();
/**
* Register zentao.
*
* @access public
* @return void
*/
public function register($from = 'admin')
{
if($_POST)
{
$response = $this->admin->registerByAPI();
$response = json_decode($response);
if($response->result == 'success')
{
{
$user = $response->data;
$data['community'] = $user->account;
$data['ztPrivateKey'] = $user->private;
$this->loadModel('setting');
$this->loadModel('setting');
$this->setting->deleteItems('owner=system&module=common&section=global&key=community');
$this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
$this->setting->setItems('system.common.global', $data);
$this->setting->setItems('system.common.global', $data);
echo js::alert($this->lang->admin->register->success);
echo js::alert($this->lang->admin->register->success);
if($from == 'admin') die(js::locate(inlink('index'), 'parent'));
if($from == 'mail') die(js::locate($this->createLink('mail', 'ztcloud'), 'parent'));
}
@@ -97,20 +97,20 @@ class admin extends control
$this->view->title = $this->lang->admin->register->caption;
$this->view->position[] = $this->lang->admin->register->caption;
$this->view->register = $this->admin->getRegisterInfo();
$this->view->sn = $this->config->global->sn;
$this->view->from = $from;
$this->display();
}
$this->view->register = $this->admin->getRegisterInfo();
$this->view->sn = $this->config->global->sn;
$this->view->from = $from;
$this->display();
}
/**
* Bind zentao.
*
* @access public
* @return void
*/
public function bind($from = 'admin')
{
/**
* Bind zentao.
*
* @access public
* @return void
*/
public function bind($from = 'admin')
{
if($_POST)
{
$response = $this->admin->bindByAPI();
@@ -121,10 +121,10 @@ class admin extends control
$data['community'] = $user->account;
$data['ztPrivateKey'] = $user->private;
$this->loadModel('setting');
$this->loadModel('setting');
$this->setting->deleteItems('owner=system&module=common&section=global&key=community');
$this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
$this->setting->setItems('system.common.global', $data);
$this->setting->setItems('system.common.global', $data);
echo js::alert($this->lang->admin->bind->success);
if($from == 'admin') die(js::locate(inlink('index'), 'parent'));
module/bug/js/create.js
+4 -4
View File
@@ -75,11 +75,11 @@ function setTemplate(templateID)
function deleteTemplate(templateID)
{
if(!templateID) return;
if(confirm(confirmDeleteTemplate))
if(confirm(confirmDeleteTemplate))
{
hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
$('#tplBox' + templateID).addClass('hidden');
}
hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
$('#tplBox' + templateID).addClass('hidden');
}
}
/* Display template x icon. */
module/install/view/step3.html.php
+3 -3
View File
@@ -4,9 +4,9 @@
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: step3.html.php 4297 2013-01-27 07:51:45Z wwccss $
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: step3.html.php 4297 2013-01-27 07:51:45Z wwccss $
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
module/install/view/step4.html.php
+3 -3
View File
@@ -4,9 +4,9 @@
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: step4.html.php 4129 2013-01-18 01:58:14Z wwccss $
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: step4.html.php 4129 2013-01-18 01:58:14Z wwccss $
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
module/product/lang/en.php
+1 -1
View File
@@ -20,7 +20,7 @@ $lang->product->create = "Create {$lang->productCommon}";
$lang->product->delete = "Delete {$lang->productCommon}";
$lang->product->deleted = "Deleted";
$lang->product->close = "Close";
$lang->product->select = " Select {$lang->productCommon}";
$lang->product->select = " Select {$lang->productCommon}";
$lang->product->mine = 'My responsibility:';
$lang->product->other = 'Other:';
$lang->product->closed = 'Closed';
module/task/model.php
+3 -3
View File
@@ -1231,9 +1231,9 @@ class taskModel extends model
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
}
}
}
}
/* Story changed or not. */
$task->needConfirm = false;
if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true;
module/upgrade/control.php
+2 -2
View File
@@ -205,8 +205,8 @@ class upgrade extends control
if($result['type'] == 'finish')
{
$response['result'] = 'finished';
$response['type'] = $type;
$response['count'] = $result['count'];
$response['type'] = $type;
$response['count'] = $result['count'];
$response['message'] = 'Finished';
}
else
module/upgrade/model.php
+5 -5
View File
@@ -1329,7 +1329,7 @@ class upgradeModel extends model
{
$result['type'] = 'doc';
$result['count'] = count($comments);
$result['lastID'] = 0;
$result['lastID'] = 0;
}
else
{
@@ -1397,7 +1397,7 @@ class upgradeModel extends model
}
}
$result['type'] = empty($nextType) ? 'finish' : $nextType;
$result['count'] = count($objects);
$result['count'] = count($objects);
$result['lastID'] = 0;
}
else
@@ -1742,10 +1742,10 @@ class upgradeModel extends model
*/
public function checkProcess()
{
$fromVersion = $this->config->installedVersion;
$needProcess = array();
$fromVersion = $this->config->installedVersion;
$needProcess = array();
if(strpos($fromVersion, 'pro') === false ? $fromVersion < '8.3' : $fromVersion < 'pro5.4') $needProcess['updateFile'] = true;
return $needProcess;
return $needProcess;
}
/**