Merge branch dev/bug-67337 of zentao/zentaopms (#12437)
This commit is contained in:
@@ -43,5 +43,6 @@ $(document).off('click','.batch-btn').on('click', '.batch-btn', function()
|
||||
|
||||
window.calcHeight = function()
|
||||
{
|
||||
if(isTutorial) return 200;
|
||||
return $('#viewCommitModal').height() - $('#viewCommitModal .modal-header').height() - $('#viewCommitModal .modal-body > .flex').height() - 200;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace zin;
|
||||
|
||||
jsVar('designID', $designID);
|
||||
jsVar('errorDate', $lang->design->errorDate);
|
||||
jsVar('isTutorial', common::isTutorialMode());
|
||||
|
||||
foreach($revisions as $revision)
|
||||
{
|
||||
|
||||
@@ -1550,6 +1550,8 @@ class tutorialModel extends model
|
||||
$design->type = 'HLDS';
|
||||
$design->files = array();
|
||||
$design->productName = 'Test product';
|
||||
$design->docs = '';
|
||||
$design->docVersions = '';
|
||||
return $design;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user