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

* Finish task #4286, #4287, #4288, #4289, #4290.

Browse Source
This commit is contained in:
chenfeiCF
2018-05-22 15:05:16 +08:00
parent 5e65a861bb
commit f5f0e79ecb
8 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/config.php
+4 -4
View File
@@ -2,13 +2,13 @@
global $lang;
$config->doc = new stdclass();
$config->doc->createLib = new stdclass();
$config->doc->editLib = new stdclass();
$config->doc->createlib = new stdclass();
$config->doc->editlib = new stdclass();
$config->doc->create = new stdclass();
$config->doc->edit = new stdclass();
$config->doc->createLib->requiredFields = 'name';
$config->doc->editLib->requiredFields = 'name';
$config->doc->createlib->requiredFields = 'name';
$config->doc->editlib->requiredFields = 'name';
$config->doc->create->requiredFields = 'title';
$config->doc->edit->requiredFields = 'title';
module/doc/css/createlib.css
+3
View File
@@ -0,0 +1,3 @@
form {margin-right: 30px;}
#whiteListBox div.input-group {margin-bottom: 2px;}
module/doc/css/editlib.css
+4
View File
@@ -1 +1,5 @@
form {margin-right: 30px;}
.chosen-container .chosen-results {max-height: 180px;}
#whiteListBox div.input-group {margin-bottom: 2px;}
module/doc/model.php
+2 -2
View File
@@ -237,7 +237,7 @@ class docModel extends model
if($lib->acl == 'private') $lib->users = $this->app->user->account;
$this->dao->insert(TABLE_DOCLIB)->data($lib)->autoCheck()
->batchCheck('name', 'notempty')
->batchCheck($this->config->doc->createlib->requiredFields, 'notempty')
->exec();
return $this->dao->lastInsertID();
@@ -261,7 +261,7 @@ class docModel extends model
$lib->users = $libCreatedBy ? $libCreatedBy : $this->app->user->account;
}
$this->dao->update(TABLE_DOCLIB)->data($lib)->autoCheck()
->batchCheck('name', 'notempty')
->batchCheck($this->config->doc->editlib->requiredFields, 'notempty')
->where('id')->eq($libID)
->exec();
if(!dao::isError()) return common::createChanges($oldLib, $lib);
module/doc/view/objectlibs.html.php
+2 -2
View File
@@ -73,8 +73,8 @@
<div class="actions">
<?php common::printLink('doc', 'collect', "objectID=$libID&objectType=doclib", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?>
<?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
<?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
<?php common::printLink('tree', 'browse', "rootID=$libID&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
<?php if(empty($lib->main)) common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
<?php common::printLink('tree', 'browse', "rootID=$libID&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
</div>
<?php endif;?>
</div>
module/project/css/view.css
+2
View File
@@ -1,3 +1,5 @@
.block-burn .panel-body{margin-top: 20px;}
#burnWrapper {max-width: 400px; margin: 0 auto; padding: 8px; position: relative;}
#burnYUnit {position: absolute; color: #CBD0DB; top: -10px; left: 10px;}
#burnLegend {position: absolute; right: 0; width: 80px; height: 40px; top: 0; margin-top: -20px; line-height: 20px; color: #838A9D; font-size: 12px;}
module/project/view/view.html.php
+1 -1
View File
@@ -183,7 +183,7 @@
<div class="row row-grid">
<?php foreach($products as $productID => $product):?>
<?php if(isset($planGroups[$productID][$product->plan])):?>
<div class="col-xs-6"><?php echo html::a($this->createLink('productplan', 'view', "planID={$product->id}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?></div>
<div class="col-xs-12"><?php echo html::a($this->createLink('productplan', 'view', "planID={$product->id}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?></div>
<?php endif;?>
<?php endforeach;?>
</div>
module/tree/view/browse.html.php
+17 -1
View File
@@ -22,7 +22,23 @@
</a>
<div class="divider"></div>
<div class="page-title">
<span class="text"><?php echo ($viewType == 'line' ? $lang->tree->manageLine : $lang->tree->common) . '：' . $root->name;?></span>
<span class="text">
<?php
if($viewType == 'doc')
{
echo $lang->doc->manageType;
}
elseif($viewType == 'line')
{
echo $lang->tree->manageLine;
}
else
{
echo $lang->tree->common;
}
echo $lang->colon . $root->name;
?>
</span>
</div>
</div>
</div>