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

Merge branch 'tsj_fixbug' into 'master'

Browse Source 
Tsj fixbug

See merge request easycorp/zentaopms!7503
This commit is contained in:
刘刚
2023-04-20 07:17:03 +00:00
parent 688aabd72f a139d7f622
commit 1d45e86bda
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/common/ext/lang/de/lite.php
+3 -3
View File
@@ -117,9 +117,9 @@ $lang->SRCommon = 'Story';
/* Doc menu. */ /* Doc menu. */
$lang->doc->menu = new stdclass(); $lang->doc->menu = new stdclass();
$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
$lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|browse|browseTyp=openedbyme", 'alias' => 'my'); $lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace');
$lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|tableContents|type=project", 'alias' => 'showfiles,project'); $lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace", 'alias' => 'showfiles,project');
$lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|tableContents|type=custom", 'alias' => 'custom'); $lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace');
$lang->doc->dividerMenu = ',project,'; $lang->doc->dividerMenu = ',project,';
extension/lite/common/ext/lang/en/lite.php
+3 -3
View File
@@ -117,9 +117,9 @@ $lang->SRCommon = 'Story';
/* Doc menu. */ /* Doc menu. */
$lang->doc->menu = new stdclass(); $lang->doc->menu = new stdclass();
$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
$lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|browse|browseTyp=openedbyme", 'alias' => 'my'); $lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace');
$lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|tableContents|type=project", 'alias' => 'showfiles,project'); $lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace", 'alias' => 'showfiles,project');
$lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|tableContents|type=custom", 'alias' => 'custom'); $lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace');
$lang->doc->dividerMenu = ',project,'; $lang->doc->dividerMenu = ',project,';
extension/lite/common/ext/lang/fr/lite.php
+3 -3
View File
@@ -117,9 +117,9 @@ $lang->SRCommon = 'Story';
/* Doc menu. */ /* Doc menu. */
$lang->doc->menu = new stdclass(); $lang->doc->menu = new stdclass();
$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
$lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|browse|browseTyp=openedbyme", 'alias' => 'my'); $lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace');
$lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|tableContents|type=project", 'alias' => 'showfiles,project'); $lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace", 'alias' => 'showfiles,project');
$lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|tableContents|type=custom", 'alias' => 'custom'); $lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace');
$lang->doc->dividerMenu = ',project,'; $lang->doc->dividerMenu = ',project,';
extension/lite/common/ext/lang/zh-cn/lite.php
+2 -2
View File
@@ -117,9 +117,9 @@ $lang->SRCommon = '目标';
/* Doc menu. */ /* Doc menu. */
$lang->doc->menu = new stdclass(); $lang->doc->menu = new stdclass();
$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
$lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'my'); $lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace');
$lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace", 'alias' => 'showfiles,project'); $lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace", 'alias' => 'showfiles,project');
$lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|tableContents|type=custom", 'alias' => 'custom'); $lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace');
$lang->doc->dividerMenu = ',project,'; $lang->doc->dividerMenu = ',project,';
module/doc/view/createlib.html.php
+8 -8
View File
@@ -27,6 +27,14 @@
<form method='post' class='main-form form-ajax no-stash form-watched' enctype='multipart/form-data' > <form method='post' class='main-form form-ajax no-stash form-watched' enctype='multipart/form-data' >
<table class='table table-form'> <table class='table table-form'>
<?php if(in_array($type, array('product', 'project', 'execution'))):?> <?php if(in_array($type, array('product', 'project', 'execution'))):?>
<?php if(in_array($type, array('product', 'project'))):?>
<tr <?php if($config->vision == 'lite') echo 'class="hidden"'?>>
<th><?php echo $lang->doc->libType;?></th>
<td>
<span><?php echo html::radio('libType', $lang->doclib->type, 'wiki', "onchange='changeDoclibAcl(this.value)'")?></span>
</td>
</tr>
<?php endif;?>
<tr class='objectBox'> <tr class='objectBox'>
<th><?php echo $lang->doc->{$type}?></th> <th><?php echo $lang->doc->{$type}?></th>
<td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' data-drop-direction='down'")?></td> <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' data-drop-direction='down'")?></td>
@@ -41,14 +49,6 @@
</td> </td>
</tr> </tr>
<?php endif;?> <?php endif;?>
<?php if(in_array($type, array('product', 'project'))):?>
<tr <?php if($config->vision == 'lite') echo 'class="hidden"'?>>
<th><?php echo $lang->doc->libType;?></th>
<td>
<span><?php echo html::radio('libType', $lang->doclib->type, 'wiki', "onchange='changeDoclibAcl(this.value)'")?></span>
</td>
</tr>
<?php endif;?>
<?php endif;?> <?php endif;?>
<tr class="normalLib"> <tr class="normalLib">
<th><?php echo $lang->doclib->name?></th> <th><?php echo $lang->doclib->name?></th>
module/doc/view/edittexttype.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<tbody> <tbody>
<tr id='headerBox'> <tr id='headerBox'>
<td width='90px'><?php echo html::a($backLink, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "id='backBtn' class='btn btn-secondary'");?></td> <td width='90px'><?php echo html::a($backLink, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "id='backBtn' class='btn btn-secondary'");?></td>
<td class="doc-title" colspan='3'><?php echo html::input('title', $doc->title, "placeholder='{$lang->doc->titlePlaceholder}'' id='editorTitle' class='form-control' required");?></td> <td class="doc-title" colspan='3'><?php echo html::input('title', $doc->title, "placeholder='{$lang->doc->titlePlaceholder}'' id='editorTitle' class='form-control' required maxlength='100'");?></td>
<td class="text-right btn-tools"> <td class="text-right btn-tools">
<?php if($doc->status == 'draft'):?> <?php if($doc->status == 'draft'):?>
<?php echo html::commonButton($lang->doc->saveDraft, "id='saveDraft'", "btn btn-secondary");?> <?php echo html::commonButton($lang->doc->saveDraft, "id='saveDraft'", "btn btn-secondary");?>