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

Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

Browse Source
This commit is contained in:
tianshujie
2023-03-31 10:37:30 +08:00
parent 736bfd226f 0fc0b37f6b
commit 5d746a97a4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/js/create.js
+1
View File
@@ -27,6 +27,7 @@ $(function()
$('#status').val('draft');
$('#dataform').submit();
});
$('#releaseBtn').click(function(){$('#dataform').submit();});
$('#basicInfoLink').click(function()
{
if($('#editorTitle').val() == '')
module/doc/model.php
+3 -3
View File
@@ -80,7 +80,7 @@ class docModel extends model
->beginIF($type == 'all')->andWhere('deleted')->eq(0)->fi()
->beginIF($excludeType)->andWhere('type')->notin($excludeType)->fi()
->andWhere('vision')->eq($this->config->vision)
->orderBy('`order` asc, id_desc')
->orderBy('`order`_asc, id_asc')
->query();
}
else
@@ -91,7 +91,7 @@ class docModel extends model
->beginIF($type)->andWhere('type')->eq($type)->fi()
->beginIF(!$type)->andWhere('type')->ne('api')->fi()
->beginIF($objectID and strpos(',product,project,execution,', ",$type,") !== false)->andWhere($type)->eq($objectID)->fi()
->orderBy("`order` asc, id_desc")->query();
->orderBy("`order`_asc, id_asc")->query();
}
$products = $this->loadModel('product')->getPairs();
@@ -137,7 +137,7 @@ class docModel extends model
if(!empty($appendLibs))
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy("`order` asc, id_desc")->query();
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy("`order`_asc, id_asc")->query();
while($lib = $stmt->fetch())
{
if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
module/doc/view/createtexttype.html.php
+1 -1
View File
@@ -128,7 +128,7 @@
<tfoot>
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton($lang->release->common);?>
<?php echo html::commonButton($lang->release->common, "id='releaseBtn'", 'btn btn-primary btn-wide');?>
<?php echo html::commonButton($lang->cancel, "data-dismiss='modal'", "btn btn-wide");?>
</td>
</tr>