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

* Finished task#4890

Browse Source
This commit is contained in:
滔哥
2018-09-19 08:11:25 +08:00
parent 946dd1d9ce
commit 000c08e943
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/action/css/trash.css
View File

@@ -1,2 +1,2 @@
.table-footer .table-actions{width:auto;visibility:visible;opacity:1;white-space: nowrap;}
.table-footer .table-actions{width:auto;visibility:visible;opacity:1;}
.table-footer .table-actions .text{line-height:28px;}

3
module/common/model.php
View File

@@ -246,7 +246,6 @@ class commonModel extends model
$isGuest = $app->user->account == 'guest';
echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
echo "<div class='avatar avatar-sm bg-secondary avatar-circle'>" . strtoupper($app->user->account{0}) . "</div>\n";
echo "<span class='user-name'>" . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</span>';
echo "<span class='caret'></span>";
echo '</a>';
@@ -1612,7 +1611,7 @@ EOD;
$user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
$user->admin = strpos($this->app->company->admins, ",{$user->account},") !== false;
$this->session->set('user', $user);
$this->app->user = $user;
$this->app->user = $user;
$this->session->set('ENTRY_CODE', $this->get->code);
$this->session->set('VALID_ENTRY', md5(md5($this->get->code) . $this->server->remote_addr));

4
module/entry/config.php
View File

@@ -1,9 +1,9 @@
<?php
$config->entry->create = new stdclass();
$config->entry->create->requiredFields = 'name, code, key';
$config->entry->create->requiredFields = 'name, code, account, key';
$config->entry->edit = new stdclass();
$config->entry->edit->requiredFields = 'name, code, key';
$config->entry->edit->requiredFields = 'name, code, account, key';
$config->entry->help = 'http://www.zentao.net/book/zentaopmshelp/integration-287.html';

4
module/entry/view/create.html.php
View File

@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package entry
* @package entry
* @version $Id$
* @link http://www.zentao.net
*/
@@ -20,7 +20,7 @@
<small><?php echo $lang->arrow . ' ' . $lang->entry->create;?></small>
</h2>
</div>
<form class='main-form' id='entryForm' method='post' class='ajaxForm'>
<form id='entryForm' method='post' class='ajaxForm'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->entry->name;?></th>

4
module/entry/view/edit.html.php
View File

@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package entry
* @package entry
* @version $Id$
* @link http://www.zentao.net
*/
@@ -20,7 +20,7 @@
<small><?php echo $lang->arrow . ' ' . $lang->entry->edit;?></small>
</h2>
</div>
<form class='main-form' id='entryForm' method='post' class='ajaxForm'>
<form id='entryForm' method='post' class='ajaxForm'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->entry->name;?></th>