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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2016-05-03 11:19:56 +08:00
parent 553963a627 6d2e09397a
commit 5ffc37fefe
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+5 -1
View File
@@ -374,7 +374,11 @@ class my extends control
if($this->post->mode == 'new')
{
$listID = $this->user->createContactList($this->post->newList, $this->post->users);
die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent'));
if(isonlybody())
{
die(js::closeModal('parent.parent', '', 'function(){parent.parent.ajaxGetContacts(\'#mailtoGroup\')}'));
}
else die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent'));
}
elseif($this->post->mode == 'edit')
{
module/project/css/managemembers.css
+4
View File
@@ -14,3 +14,7 @@
.modal-dialog {margin-top: 10%;}
.table-form thead > tr > th {background: none; border: none}
#titlebar > .heading {float: left; padding-right: 10px!important}
#titlebar > .heading > .icon {display: inline;}
#deptSelector {float: left; min-width: 220px; position: relative; top: -7px}
module/project/view/managemembers.html.php
+3 -4
View File
@@ -16,11 +16,10 @@
<?php js::set('roles', $roles);?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['team']);?></span>
<strong> <?php echo $lang->project->manageMembers;?></strong>
<small class='text-muted'><i class='icon icon-cogs'></i></small>
<strong><?php echo $lang->project->manageMembers;?></strong>
<i class='icon icon-angle-right text-muted'></i>
</div>
<div><?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->project->selectDept}'");?></div>
<div id='deptSelector'><?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->project->selectDept}'");?></div>
<div class='actions'>
<button class='btn' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copyTeam;?></button>
</div>
www/js/my.full.js
+1 -1
View File
@@ -624,7 +624,7 @@ function ajaxGetContacts(obj)
{
if(!contacts) return false;
$inputgroup = $(obj).parent().parent();
$inputgroup = $(obj).closest('.input-group');
$inputgroup.find('.input-group-btn').remove();
$inputgroup.append(contacts);
$inputgroup.find('select:last').chosen(defaultChosenOptions);