Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
daitingting
@@ -292,6 +292,7 @@ CREATE TABLE IF NOT EXISTS `zt_doclib` (
|
||||
`groups` varchar(255) NOT NULL,
|
||||
`users` text NOT NULL,
|
||||
`main` enum('0','1') NOT NULL default '0',
|
||||
`collector` text NOT NULL,
|
||||
`order` tinyint(5) unsigned NOT NULL,
|
||||
`deleted` enum('0','1') NOT NULL default '0',
|
||||
PRIMARY KEY (`id`)
|
||||
@@ -404,6 +405,7 @@ CREATE TABLE IF NOT EXISTS `zt_module` (
|
||||
`order` smallint(5) unsigned NOT NULL default '0',
|
||||
`type` char(30) NOT NULL,
|
||||
`owner` varchar(30) NOT NULL,
|
||||
`collector` text NOT NULL,
|
||||
`short` varchar(30) NOT NULL,
|
||||
`deleted` enum('0','1') NOT NULL default '0',
|
||||
PRIMARY KEY (`id`),
|
||||
@@ -1109,6 +1111,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(1, 'my', 'testCase'),
|
||||
(1, 'my', 'testTask'),
|
||||
(1, 'my', 'todo'),
|
||||
(1, 'my', 'calendar'),
|
||||
(1, 'my', 'unbind'),
|
||||
(1, 'my', 'manageContacts'),
|
||||
(1, 'my', 'deleteContacts'),
|
||||
@@ -1421,6 +1424,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(2, 'my', 'story'),
|
||||
(2, 'my', 'task'),
|
||||
(2, 'my', 'todo'),
|
||||
(2, 'my', 'calendar'),
|
||||
(2, 'my', 'unbind'),
|
||||
(2, 'my', 'manageContacts'),
|
||||
(2, 'my', 'deleteContacts'),
|
||||
@@ -1605,6 +1609,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(3, 'my', 'testCase'),
|
||||
(3, 'my', 'testTask'),
|
||||
(3, 'my', 'todo'),
|
||||
(3, 'my', 'calendar'),
|
||||
(3, 'my', 'unbind'),
|
||||
(3, 'my', 'manageContacts'),
|
||||
(3, 'my', 'deleteContacts'),
|
||||
@@ -1844,6 +1849,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(4, 'my', 'testCase'),
|
||||
(4, 'my', 'testTask'),
|
||||
(4, 'my', 'todo'),
|
||||
(4, 'my', 'calendar'),
|
||||
(4, 'my', 'unbind'),
|
||||
(4, 'my', 'manageContacts'),
|
||||
(4, 'my', 'deleteContacts'),
|
||||
@@ -2070,6 +2076,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(5, 'my', 'testCase'),
|
||||
(5, 'my', 'testTask'),
|
||||
(5, 'my', 'todo'),
|
||||
(5, 'my', 'calendar'),
|
||||
(5, 'my', 'unbind'),
|
||||
(5, 'my', 'manageContacts'),
|
||||
(5, 'my', 'deleteContacts'),
|
||||
@@ -2342,6 +2349,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(6, 'my', 'testCase'),
|
||||
(6, 'my', 'testTask'),
|
||||
(6, 'my', 'todo'),
|
||||
(6, 'my', 'calendar'),
|
||||
(6, 'my', 'unbind'),
|
||||
(6, 'my', 'manageContacts'),
|
||||
(6, 'my', 'deleteContacts'),
|
||||
@@ -2566,6 +2574,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(7, 'my', 'testCase'),
|
||||
(7, 'my', 'testTask'),
|
||||
(7, 'my', 'todo'),
|
||||
(7, 'my', 'calendar'),
|
||||
(7, 'my', 'unbind'),
|
||||
(7, 'my', 'manageContacts'),
|
||||
(7, 'my', 'deleteContacts'),
|
||||
@@ -2816,6 +2825,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(8, 'my', 'testCase'),
|
||||
(8, 'my', 'testTask'),
|
||||
(8, 'my', 'todo'),
|
||||
(8, 'my', 'calendar'),
|
||||
(8, 'my', 'unbind'),
|
||||
(8, 'my', 'manageContacts'),
|
||||
(8, 'my', 'deleteContacts'),
|
||||
@@ -3054,6 +3064,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(9, 'my', 'testCase'),
|
||||
(9, 'my', 'testTask'),
|
||||
(9, 'my', 'todo'),
|
||||
(9, 'my', 'calendar'),
|
||||
(9, 'my', 'unbind'),
|
||||
(9, 'my', 'manageContacts'),
|
||||
(9, 'my', 'deleteContacts'),
|
||||
@@ -3199,6 +3210,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
|
||||
(10, 'my', 'profile'),
|
||||
(10, 'my', 'task'),
|
||||
(10, 'my', 'todo'),
|
||||
(10, 'my', 'calendar'),
|
||||
(10, 'my', 'unbind'),
|
||||
(10, 'product', 'browse'),
|
||||
(10, 'product', 'doc'),
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='w-id text-center'><?php echo $lang->idAB?></th>
|
||||
<?php if($longBlock):?>
|
||||
<th><?php echo $lang->build->product;?></th>
|
||||
<?php endif;?>
|
||||
<th><?php echo $lang->build->name;?></th>
|
||||
<th class='w-date'><?php echo $lang->build->date;?></th>
|
||||
</tr>
|
||||
@@ -28,7 +30,9 @@
|
||||
?>
|
||||
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
|
||||
<td class='text-center'><?php echo $build->id;?></td>
|
||||
<?php if($longBlock):?>
|
||||
<td title='<?php echo $build->productName?>'><?php echo $build->productName?></td>
|
||||
<?php endif;?>
|
||||
<td title='<?php echo $build->name?>'><?php echo $build->name?></td>
|
||||
<td><?php echo $build->date?></td>
|
||||
</tr>
|
||||
|
||||
@@ -130,6 +130,7 @@ $lang->bug->ditto = '同上';
|
||||
$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
|
||||
$lang->bug->noAssigned = '未指派';
|
||||
$lang->bug->noBug = '暫時沒有BUG，您現在可以';
|
||||
$lang->bug->noModule = '<div>您現在還沒有模組信息</div><div>請維護測試模組</div>';
|
||||
|
||||
/* 頁面標籤。*/
|
||||
$lang->bug->lblAssignedTo = '當前指派';
|
||||
|
||||
@@ -243,8 +243,8 @@ $lang->project->subMenu->list->tree = '樹狀圖|project|tree|projectID=%s'
|
||||
|
||||
$lang->project->subMenu->qa = new stdclass();
|
||||
$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
|
||||
$lang->project->subMenu->qa->build = '版本|project|build|projectID=%s';
|
||||
$lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport');
|
||||
$lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
|
||||
$lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
|
||||
|
||||
$lang->project->subMenu->action = new stdclass();
|
||||
$lang->project->subMenu->action->dynamic = '動態|project|dynamic|projectID=%s';
|
||||
@@ -345,7 +345,7 @@ $lang->company->menu = new stdclass();
|
||||
$lang->company->menu->browseUser = array('link' => '用戶|company|browse', 'subModule' => 'user');
|
||||
$lang->company->menu->dept = array('link' => '部門|dept|browse', 'subModule' => 'dept');
|
||||
$lang->company->menu->browseGroup = array('link' => '權限|group|browse', 'subModule' => 'group');
|
||||
$lang->company->menu->view = array('link' => '公司|company|view', 'alias' => 'edit');
|
||||
$lang->company->menu->view = array('link' => '公司|company|view');
|
||||
$lang->company->menu->dynamic = '動態|company|dynamic|';
|
||||
|
||||
$lang->dept = new stdclass();
|
||||
|
||||
+17
-16
@@ -60,20 +60,21 @@ $lang->doc->myDoc = '我的文檔';
|
||||
$lang->doc->myCollection = '我的收藏';
|
||||
|
||||
/* 方法列表。*/
|
||||
$lang->doc->index = '文檔主頁';
|
||||
$lang->doc->create = '創建文檔';
|
||||
$lang->doc->edit = '編輯文檔';
|
||||
$lang->doc->delete = '刪除文檔';
|
||||
$lang->doc->browse = '文檔列表';
|
||||
$lang->doc->view = '文檔詳情';
|
||||
$lang->doc->diff = '對比';
|
||||
$lang->doc->sort = '排序';
|
||||
$lang->doc->manageType = '維護分類';
|
||||
$lang->doc->editType = '編輯分類';
|
||||
$lang->doc->deleteType = '刪除分類';
|
||||
$lang->doc->addType = '增加分類';
|
||||
$lang->doc->childType = '子分類';
|
||||
$lang->doc->collect = '收藏';
|
||||
$lang->doc->index = '文檔主頁';
|
||||
$lang->doc->create = '創建文檔';
|
||||
$lang->doc->edit = '編輯文檔';
|
||||
$lang->doc->delete = '刪除文檔';
|
||||
$lang->doc->browse = '文檔列表';
|
||||
$lang->doc->view = '文檔詳情';
|
||||
$lang->doc->diff = '對比';
|
||||
$lang->doc->sort = '排序';
|
||||
$lang->doc->manageType = '維護分類';
|
||||
$lang->doc->editType = '編輯分類';
|
||||
$lang->doc->deleteType = '刪除分類';
|
||||
$lang->doc->addType = '增加分類';
|
||||
$lang->doc->childType = '子分類';
|
||||
$lang->doc->collect = '收藏';
|
||||
$lang->doc->cancelCollection = '取消收藏';
|
||||
|
||||
$lang->doc->libName = '文檔庫名稱';
|
||||
$lang->doc->libType = '文檔庫類型';
|
||||
@@ -130,8 +131,8 @@ $lang->doc->fastMenuIconList['byediteddate'] = 'icon-folder-upload';
|
||||
$lang->doc->fastMenuIconList['openedbyme'] = 'icon-folder-account';
|
||||
$lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
|
||||
|
||||
$lang->doc->customObjectLibs['files'] = '是否顯示附件庫';
|
||||
$lang->doc->customObjectLibs['customFiles'] = '是否顯示自定義檔案';
|
||||
$lang->doc->customObjectLibs['files'] = '顯示附件庫';
|
||||
$lang->doc->customObjectLibs['customFiles'] = '顯示自定義檔案';
|
||||
|
||||
$lang->doc->confirmDelete = "您確定刪除該文檔嗎？";
|
||||
$lang->doc->confirmDeleteLib = "您確定刪除該文檔庫嗎？";
|
||||
|
||||
@@ -72,6 +72,7 @@ $lang->index->methodOrder[0] = 'index';
|
||||
$lang->resource->my = new stdclass();
|
||||
$lang->resource->my->index = 'index';
|
||||
$lang->resource->my->todo = 'todo';
|
||||
$lang->resource->my->calendar = 'calendar';
|
||||
$lang->resource->my->task = 'task';
|
||||
$lang->resource->my->bug = 'bug';
|
||||
$lang->resource->my->testTask = 'testTask';
|
||||
|
||||
@@ -4,6 +4,7 @@ $lang->my->common = 'Dashboard';
|
||||
/* Method List。*/
|
||||
$lang->my->index = 'Home';
|
||||
$lang->my->todo = 'My Todo';
|
||||
$lang->my->calendar = 'Calendar';
|
||||
$lang->my->task = 'My Task';
|
||||
$lang->my->bug = 'My Bug';
|
||||
$lang->my->testTask = 'My Build';
|
||||
|
||||
@@ -4,6 +4,7 @@ $lang->my->common = '我的地盘';
|
||||
/* 方法列表。*/
|
||||
$lang->my->index = '首页';
|
||||
$lang->my->todo = '我的待办';
|
||||
$lang->my->calendar = '日程';
|
||||
$lang->my->task = '我的任务';
|
||||
$lang->my->bug = '我的Bug';
|
||||
$lang->my->testTask = '我的版本';
|
||||
|
||||
@@ -4,6 +4,7 @@ $lang->my->common = '我的地盤';
|
||||
/* 方法列表。*/
|
||||
$lang->my->index = '首頁';
|
||||
$lang->my->todo = '我的待辦';
|
||||
$lang->my->calendar = '日程';
|
||||
$lang->my->task = '我的任務';
|
||||
$lang->my->bug = '我的Bug';
|
||||
$lang->my->testTask = '我的版本';
|
||||
|
||||
@@ -41,7 +41,6 @@ $lang->project->whitelist = '分組白名單';
|
||||
$lang->project->totalEstimate = '預計';
|
||||
$lang->project->totalConsumed = '消耗';
|
||||
$lang->project->totalLeft = '剩餘';
|
||||
$lang->project->Left = '剩餘';
|
||||
$lang->project->progress = '進度';
|
||||
$lang->project->hours = '預計 %s 消耗 %s 剩餘 %s';
|
||||
$lang->project->viewBug = '查看bug';
|
||||
@@ -117,7 +116,6 @@ $lang->project->latestDynamic = '最新動態';
|
||||
$lang->project->build = '所有版本';
|
||||
$lang->project->testtask = '測試任務';
|
||||
$lang->project->burn = '燃盡圖';
|
||||
$lang->project->baseline = '基準綫';
|
||||
$lang->project->computeBurn = '更新';
|
||||
$lang->project->burnData = '燃盡圖數據';
|
||||
$lang->project->fixFirst = '修改首天工時';
|
||||
|
||||
@@ -118,6 +118,7 @@ $lang->testcase->allCases = '所有';
|
||||
$lang->testcase->allTestcases = '所有用例';
|
||||
$lang->testcase->needConfirm = '需求變動';
|
||||
$lang->testcase->bySearch = '搜索';
|
||||
$lang->testcase->unexecuted = '未執行';
|
||||
|
||||
$lang->testcase->lblStory = '相關需求';
|
||||
$lang->testcase->lblLastEdited = '最後編輯';
|
||||
@@ -131,6 +132,7 @@ $lang->testcase->legendLinkBugs = '相關Bug';
|
||||
$lang->testcase->legendOpenAndEdit = '創建編輯';
|
||||
$lang->testcase->legendComment = '備註';
|
||||
|
||||
$lang->testcase->summary = "本頁共 <strong>%s</strong> 個用例，已執行<strong>%s</strong>個。";
|
||||
$lang->testcase->confirmDelete = '您確認要刪除該測試用例嗎？';
|
||||
$lang->testcase->confirmBatchDelete = '您確認要批量刪除這些測試用例嗎？';
|
||||
$lang->testcase->ditto = '同上';
|
||||
@@ -188,6 +190,8 @@ $lang->testcase->noFunction = '不存在iconv和mb_convert_encoding轉碼
|
||||
$lang->testcase->noRequire = "%s行的“%s”是必填欄位，不能為空";
|
||||
$lang->testcase->noLibrary = "現在還沒有公共庫，請先創建！";
|
||||
$lang->testcase->mustChooseResult = '必須選擇評審結果';
|
||||
$lang->testcase->noModule = '<div>您現在還沒有模組信息</div><div>請維護測試模組</div>';
|
||||
$lang->testcase->noCase = '暫時沒有用例，您現在可以';
|
||||
|
||||
$lang->testcase->searchStories = '鍵入來搜索需求';
|
||||
$lang->testcase->selectLib = '請選擇庫';
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<span class='text' style='color: <?php echo $case->color; ?>'><?php echo $case->title;?></span>
|
||||
|
||||
<?php if($case->deleted):?>
|
||||
<span class='label label-danger'><?php echo $lang->case->deleted;?></span>
|
||||
<span class='label label-danger'><?php echo $lang->product->deleted;?></span>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if($case->version > 1):?>
|
||||
|
||||
@@ -104,6 +104,7 @@ $lang->testtask->showFail = '失敗<span class="text-danger">%s</span>次';
|
||||
$lang->testtask->confirmDelete = '您確認要刪除該版本嗎？';
|
||||
$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
|
||||
$lang->testtask->noticeNoOther = '該產品還沒有其他測試版本';
|
||||
$lang->testtask->noTesttask = '暫時沒有記錄，您現在可以';
|
||||
|
||||
$lang->testtask->assignedToMe = '指派給我';
|
||||
$lang->testtask->allCases = '所有用例';
|
||||
|
||||
@@ -62,6 +62,7 @@ class todo extends control
|
||||
$this->send(array('result' => 'success', 'id' => $todoID, 'name' => $todo->name, 'pri' => $todo->pri, 'priName' => $this->lang->todo->priList[$todo->pri], 'time' => date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin));
|
||||
}
|
||||
|
||||
if(isonlybody()) die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent.parent'));
|
||||
die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
|
||||
}
|
||||
|
||||
|
||||
@@ -219,7 +219,7 @@ class todoModel extends model
|
||||
$todo->type = $data->types[$todoID];
|
||||
$todo->pri = $data->pris[$todoID];
|
||||
$todo->status = $data->status[$todoID];
|
||||
$todo->name = $todo->type == 'custom' ? $data->names[$todoID] : '';
|
||||
$todo->name = ($todo->type == 'custom' or $todo->type == 'cycle') ? $data->names[$todoID] : '';
|
||||
$todo->begin = $data->begins[$todoID];
|
||||
$todo->end = $data->ends[$todoID];
|
||||
if($todo->type == 'task') $todo->idvalue = isset($data->tasks[$todoID]) ? $data->tasks[$todoID] : 0;
|
||||
|
||||
@@ -135,4 +135,3 @@ $lang->upgrade->fromVersions['9_8'] = '9.8';
|
||||
$lang->upgrade->fromVersions['9_8_1'] = '9.8.1';
|
||||
$lang->upgrade->fromVersions['9_8_2'] = '9.8.2';
|
||||
$lang->upgrade->fromVersions['9_8_3'] = '9.8.3';
|
||||
$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta';
|
||||
|
||||
@@ -135,4 +135,3 @@ $lang->upgrade->fromVersions['9_8'] = '9.8';
|
||||
$lang->upgrade->fromVersions['9_8_1'] = '9.8.1';
|
||||
$lang->upgrade->fromVersions['9_8_2'] = '9.8.2';
|
||||
$lang->upgrade->fromVersions['9_8_3'] = '9.8.3';
|
||||
$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta';
|
||||
|
||||
@@ -135,4 +135,3 @@ $lang->upgrade->fromVersions['9_8'] = '9.8';
|
||||
$lang->upgrade->fromVersions['9_8_1'] = '9.8.1';
|
||||
$lang->upgrade->fromVersions['9_8_2'] = '9.8.2';
|
||||
$lang->upgrade->fromVersions['9_8_3'] = '9.8.3';
|
||||
$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta';
|
||||
|
||||
@@ -217,8 +217,8 @@ class upgradeModel extends model
|
||||
$this->execSQL($this->getUpgradeFile('9.8.2'));
|
||||
$this->addUniqueKeyToTeam();
|
||||
case '9_8_3':
|
||||
case '10_0_beta':
|
||||
$this->execSQL($this->getUpgradeFile('10_0_beta'));
|
||||
$this->execSQL($this->getUpgradeFile('9.8.3'));
|
||||
$this->adjustPriv10_0_alpha();
|
||||
}
|
||||
|
||||
$this->deletePatch();
|
||||
@@ -326,8 +326,7 @@ class upgradeModel extends model
|
||||
case '9_8':
|
||||
case '9_8_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.1'));
|
||||
case '9_8_2': $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.2'));
|
||||
case '9_8_3':
|
||||
case '10_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.beta'));
|
||||
case '9_8_3': $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.3'));
|
||||
}
|
||||
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
|
||||
}
|
||||
@@ -2283,4 +2282,24 @@ class upgradeModel extends model
|
||||
$this->dao->exec("ALTER TABLE " . TABLE_TEAM . " ADD UNIQUE `team` (`root`, `type`, `account`)");
|
||||
return !dao::isError();
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjust priv for 10_0_alpha.
|
||||
*
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
public function adjustPriv10_0_alpha()
|
||||
{
|
||||
$groups = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('my')->andWhere('method')->eq('todo')->fetchPairs('group', 'group');
|
||||
foreach($groups as $group)
|
||||
{
|
||||
$groupPriv = new stdclass();
|
||||
$groupPriv->group = $groupID;
|
||||
$groupPriv->module = 'my';
|
||||
$groupPriv->method = 'calendar';
|
||||
$this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -365,7 +365,7 @@ function setOuterBox()
|
||||
*/
|
||||
function setForm()
|
||||
{
|
||||
if(config.debug) alert('[Zentao-ZUI 通知] setForm 方法已被弃用，为表单元素 form 添加 [type="ajax"] 或者 .ajax-form 来自动配置 Ajax 表单。');
|
||||
// if(config.debug) alert('[Zentao-ZUI 通知] setForm 方法已被弃用，为表单元素 form 添加 [type="ajax"] 或者 .ajax-form 来自动配置 Ajax 表单。');
|
||||
|
||||
var formClicked = false;
|
||||
$('form').submit(function()
|
||||
@@ -412,7 +412,7 @@ function setForm()
|
||||
*/
|
||||
function setFormAction(actionLink, hiddenwin, obj)
|
||||
{
|
||||
if(config.debug) alert('[Zentao-ZUI 通知] setFormAction 方法已被弃用，在表单中使用如下格式会自动初始化表单提交按钮：\n<a data-form-action="要提交的表单地址">编辑</a>');
|
||||
// if(config.debug) alert('[Zentao-ZUI 通知] setFormAction 方法已被弃用，在表单中使用如下格式会自动初始化表单提交按钮：\n<a data-form-action="要提交的表单地址">编辑</a>');
|
||||
|
||||
$form = typeof(obj) == 'undefined' ? $('form') : $(obj).closest('form');
|
||||
if(hiddenwin) $form.attr('target', hiddenwin);
|
||||
@@ -874,7 +874,7 @@ function isNum(s)
|
||||
*/
|
||||
function setModal4List(triggerClass, replaceID, callback, width)
|
||||
{
|
||||
if(config.debug) return alert('[Zentao-ZUI 通知] setModal4List 方法已被禁用，如果要为表格列表启用表格内触发打开的对话框关闭后动态更新列表有如下两种方式：\n1. 使用 hot 选项初始化 table 插件：<form class="main-table" data-ride="table" data-hot="true">\n2. 在对话框表单POST请求后返回内容中设置 selfClose cookie 值为 1：<script>parent.parent.$.cookie("selfClose", 1);parent.parent.$.closeModal(null, "this"); </script>');
|
||||
// if(config.debug) return alert('[Zentao-ZUI 通知] setModal4List 方法已被禁用，如果要为表格列表启用表格内触发打开的对话框关闭后动态更新列表有如下两种方式：\n1. 使用 hot 选项初始化 table 插件：<form class="main-table" data-ride="table" data-hot="true">\n2. 在对话框表单POST请求后返回内容中设置 selfClose cookie 值为 1：<script>parent.parent.$.cookie("selfClose", 1);parent.parent.$.closeModal(null, "this"); </script>');
|
||||
if(typeof(width) == 'undefined') width = 900;
|
||||
$('.' + triggerClass).modalTrigger(
|
||||
{
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user