diff --git a/workflow/engine/methods/authSources/authSources_List.php b/workflow/engine/methods/authSources/authSources_List.php index 16955e9b6..6d0f299e3 100755 --- a/workflow/engine/methods/authSources/authSources_List.php +++ b/workflow/engine/methods/authSources/authSources_List.php @@ -33,7 +33,7 @@ G::LoadClass( 'configuration' ); $c = new Configurations(); $configPage = $c->getConfiguration( 'authSourcesList', 'pageSize', '', $_SESSION['USER_LOGGED'] ); $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20; - +G::pr($Config); $G_MAIN_MENU = 'processmaker'; $G_SUB_MENU = 'users'; $G_ID_MENU_SELECTED = 'USERS'; @@ -42,7 +42,8 @@ $G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES'; $G_PUBLISH = new Publisher(); $oHeadPublisher = & headPublisher::getSingleton(); -$oHeadPublisher->addExtJsScript( 'authSources/authSourcesList', false ); //adding a javascript file .js +$oHeadPublisher->addExtJsScript( 'authSources/authSourcesList', false ); //adding a javascript file .js +$oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/authSourcesList', false ); //adding a javascript file .js $oHeadPublisher->addContent( 'authSources/authSourcesList' ); //adding a html file .html. $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); $oHeadPublisher->assign( 'CONFIG', $Config ); diff --git a/workflow/engine/methods/authSources/authSources_SelectType.php b/workflow/engine/methods/authSources/authSources_SelectType.php index 437823ba8..8ae58e893 100755 --- a/workflow/engine/methods/authSources/authSources_SelectType.php +++ b/workflow/engine/methods/authSources/authSources_SelectType.php @@ -34,11 +34,13 @@ $G_ID_MENU_SELECTED = 'USERS'; $G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES'; $aAuthSourceTypes = array (array ('sType' => 'char','sLabel' => 'char')); +error_log(PATH_RBAC . 'plugins' . PATH_SEP); $oDirectory = dir( PATH_RBAC . 'plugins' . PATH_SEP ); while ($sObject = $oDirectory->read()) { if (($sObject != '.') && ($sObject != '..') && ($sObject != '.svn') && ($sObject != 'ldap')) { if (is_file( PATH_RBAC . 'plugins' . PATH_SEP . $sObject )) { $sType = trim( str_replace( 'class.', '', str_replace( '.php', '', $sObject ) ) ); + error_log($sType); $aAuthSourceTypes[] = array ('sType' => $sType,'sLabel' => $sType ); } } diff --git a/workflow/engine/templates/ldapAdvanced/authSourcesList.js b/workflow/engine/templates/ldapAdvanced/authSourcesList.js index fe7150ecd..ece98e9e7 100755 --- a/workflow/engine/templates/ldapAdvanced/authSourcesList.js +++ b/workflow/engine/templates/ldapAdvanced/authSourcesList.js @@ -2,7 +2,7 @@ var synchronizeDepartmentsLDAPADV = function() { iGrid = Ext.getCmp('infoGrid'); rowSelected = iGrid.getSelectionModel().getSelected(); if (rowSelected) { - location.href = '../ldapAdvanced/authSourcesSynchronize?authUid=' + rowSelected.data.AUTH_SOURCE_UID + '&tab=synchronizeDepartments'; + location.href = 'authSourcesSynchronize?authUid=' + rowSelected.data.AUTH_SOURCE_UID + '&tab=synchronizeDepartments'; } }; @@ -10,19 +10,19 @@ var synchronizeGroupsLDAPADV = function() { iGrid = Ext.getCmp('infoGrid'); rowSelected = iGrid.getSelectionModel().getSelected(); if (rowSelected) { - location.href = '../ldapAdvanced/authSourcesSynchronize?authUid=' + rowSelected.data.AUTH_SOURCE_UID + '&tab=synchronizeGroups'; + location.href = 'authSourcesSynchronize?authUid=' + rowSelected.data.AUTH_SOURCE_UID + '&tab=synchronizeGroups'; } }; var synchronizeDepartmentsButtonLDAPADV = new Ext.Action({ - text: 'Synchronize Departments', + text: 'Synchronize Departmentssss', iconCls: 'ICON_DEPARTAMENTS', disabled: true, handler: synchronizeDepartmentsLDAPADV }); var synchronizeGroupsButtonLDAPADV = new Ext.Action({ - text: 'Synchronize Groups', + text: 'Synchronize Groupssss', iconCls: 'ICON_GROUPS', disabled: true, handler: synchronizeGroupsLDAPADV