fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in 3.1.3 (pull request #5062)

Browse Source 
3.1.3
This commit is contained in:
Paula Quispe
2016-10-26 22:14:54 +00:00
parent edbe88a628 790fedb441
commit 3d56df5497
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.license.app.php
View File

@@ -269,7 +269,10 @@ class license_application extends padl
$ips[$ip] = $ip;
}
}
# count return ips and return if found
if (count($ips) > 0) {
return $ips;
}
if (isset($this->_SERVER_VARS['SERVER_ADDR'])) {
$name = gethostbyaddr($this->_SERVER_VARS['SERVER_ADDR']);
$ip = gethostbyname($name);

18
workflow/engine/classes/model/Groupwf.php
View File

@@ -318,7 +318,7 @@ class Groupwf extends BaseGroupwf
return $result;
}
public function getAllGroup($start = null, $limit = null, $search = null, $sortField = null, $sortDir = null)
public function getAllGroup($start = null, $limit = null, $search = null, $sortField = null, $sortDir = null, $countUsers = false)
{
require_once PATH_RBAC . "model/RbacUsers.php";
require_once 'classes/model/TaskUser.php';
@@ -336,6 +336,22 @@ class Groupwf extends BaseGroupwf
$criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
}
$totalRows = GroupwfPeer::doCount($criteria);
if ($countUsers) {
//This query must be changed in the next version from Propel
$criteria->addAsColumn("GRP_USERS",
"(SELECT
COUNT(" . UsersPeer::USR_UID . ")
FROM
" . GroupUserPeer::TABLE_NAME . "
LEFT JOIN
" . UsersPeer::TABLE_NAME . "
ON (" . GroupUserPeer::USR_UID . " = " . UsersPeer::USR_UID . ")
WHERE
" . GroupUserPeer::GRP_UID . " = " . GroupwfPeer::GRP_UID . " AND
" . UsersPeer::USR_STATUS . " <> 'CLOSED')");
}
if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
$criteria->addDescendingOrderByColumn($sortField);
} else {

7
workflow/engine/methods/groups/groups_Ajax.php
View File

@@ -83,7 +83,6 @@ switch ($_POST['action']) {
case 'groupsList':
require_once 'classes/model/Groupwf.php';
require_once 'classes/model/TaskUser.php';
require_once 'classes/model/GroupUser.php';
G::LoadClass( 'configuration' );
$co = new Configurations();
$config = $co->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
@@ -103,15 +102,12 @@ switch ($_POST['action']) {
$tasks = new TaskUser();
$aTask = $tasks->getCountAllTaksByGroups();
$members = new GroupUser();
$aMembers = $members->getCountAllUsersByGroup();
require_once PATH_CONTROLLERS . 'adminProxy.php';
$uxList = adminProxy::getUxTypesList();
$groups = new Groupwf();
$data = $groups->getAllGroup( $start, $limit, $filter, $sortField, $sortDir);
$data = $groups->getAllGroup( $start, $limit, $filter, $sortField, $sortDir, true);
$result = $data['rows'];
$totalRows = 0;
@@ -122,7 +118,6 @@ switch ($_POST['action']) {
), array ("&lt;","&gt;"
), $results['GRP_TITLE'] );
$results['GRP_TASKS'] = isset( $aTask[$results['GRP_UID']] ) ? $aTask[$results['GRP_UID']] : 0;
$results['GRP_USERS'] = isset( $aMembers[$results['GRP_UID']] ) ? $aMembers[$results['GRP_UID']] : 0;
$arrData[] = $results;
}