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

* finish task#1271.

Browse Source 
* code for task@1323.
This commit is contained in:
chencongzhi520@gmail.com
2013-04-15 02:45:49 +00:00
parent 862c73cf1e
commit dd383e1a65
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/group/config.php
View File

@@ -1,5 +1,6 @@
<?php
$config->group = new stdclass();
$config->group->showUsers = 20;
$config->group->create = new stdclass();
$config->group->edit = new stdclass();
$config->group->create->requiredFields = 'name';

9
module/group/control.php
View File

@@ -39,10 +39,13 @@ class group extends control
$position[] = $this->lang->group->browse;
$groups = $this->group->getList($companyID);
$groupUsers = array();
foreach($groups as $group) $groupUsers[$group->id] = $this->group->getUserPairs($group->id);
$this->view->title = $title;
$this->view->position = $position;
$this->view->groups = $groups;
$this->view->title = $title;
$this->view->position = $position;
$this->view->groups = $groups;
$this->view->groupUsers = $groupUsers;
$this->display();
}

9
module/group/view/browse.html.php
View File

@@ -22,6 +22,7 @@
<th class='w-id'><?php echo $lang->group->id;?></th>
<th class='w-100px'><?php echo $lang->group->name;?></th>
<th><?php echo $lang->group->desc;?></th>
<th class='w-p60'><?php echo $lang->group->users;?></th>
<th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -29,8 +30,14 @@
<?php foreach($groups as $group):?>
<tr class='a-center'>
<td class='strong'><?php echo $group->id;?></td>
<td><?php echo $group->name;?></td>
<td class='a-left'><?php echo $group->name;?></td>
<td class='a-left'><?php echo $group->desc;?></td>
<td class='a-left'>
<?php
$groupUsers[$group->id] = array_slice($groupUsers[$group->id], 0, $this->config->group->showUsers);
foreach($groupUsers[$group->id] as $user) echo $user . ' ';
?>
</td>
<td class='a-center'>
<?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
<?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", '', 'list');?>

8
module/user/control.php
View File

@@ -421,12 +421,16 @@ class user extends control
if(dao::isError()) die(js::error(dao::getError()));
die(js::locate($this->createLink('company', 'browse'), 'parent'));
}
$groups = $this->loadModel('group')->getList($this->app->company->id);
$groupUsers = array();
foreach($groups as $group) $groupUsers[$group->id] = $this->group->getUserPairs($group->id);
$this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->user->editGroup;
$this->view->position[] = $this->lang->user->editGroup;
$this->view->account = $account;
$this->view->userGroups = $this->loadModel('group')->getByAccount($account);
$this->view->groups = $this->loadModel('group')->getList($this->app->company->id);
$this->view->userGroups = $this->group->getByAccount($account);
$this->view->groups = $groups;
$this->view->groupUsers = $groupUsers;
$this->display();
}

13
module/user/view/editgroup.html.php
View File

@@ -23,15 +23,22 @@
<th class='w-id'><?php echo $lang->group->id;?></th>
<th class='w-100px'><?php echo $lang->group->name;?></th>
<th><?php echo $lang->group->desc;?></th>
<th class='w-p60'><?php echo $lang->group->users;?></th>
</tr>
</thead>
<tbody>
<?php foreach($groups as $group):?>
<tr class='a-left'>
<td class='strong'> <?php echo html::checkbox('groups', array($group->id => $group->id), isset($userGroups[$group->id]) ? $group->id : '', "class='ml-10px'");?></td>
<td class='a-center'><?php echo $group->name;?></td>
<td class='a-left'> <?php echo $group->desc;?></td>
</tr>
<td><?php echo $group->name;?></td>
<td><?php echo $group->desc;?></td>
<td>
<?php
$groupUsers[$group->id] = array_slice($groupUsers[$group->id], 0, $this->config->group->showUsers);
foreach($groupUsers[$group->id] as $user) echo $user . ' ';
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot>