Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-07 00:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Actions strings on Users,Groups,Profiles,Customers and Categories tab won't be an union of strings.

Browse Source
This commit is contained in:
nuxsmin
2014-03-02 12:57:01 +01:00
parent 2cb8124678
commit 401a8f7e91
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ajax/ajax_getContent.php
View File

@@ -24,7 +24,7 @@
*
*/
define('APP_ROOT', '..');
require_once APP_ROOT.DIRECTORY_SEPARATOR.'inc'.DIRECTORY_SEPARATOR.'init.php';
require_once APP_ROOT . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'init.php';
SP_Util::checkReferer('POST');
@@ -104,7 +104,6 @@ switch ($action) {
if (SP_ACL::checkUserAccess("users")) {
$arrUsersTableProp = array(
'itemName' => _('Usuario'),
'tblId' => 'tblUsers',
'header' => '',
'tblHeaders' => array(
@@ -117,8 +116,7 @@ switch ($action) {
'user_name',
'user_login',
'userprofile_name',
'usergroup_name',
array(
'usergroup_name', array(
'user_isAdminApp' => array('img_file' => 'check_blue.png', 'img_title' => _('Admin Aplicación')),
'user_isAdminAcc' => array('img_file' => 'check_orange.png', 'img_title' => _('Admin Cuentas')),
'user_isLdap' => array('img_file' => 'ldap.png', 'img_title' => _('Usuario de LDAP')),
@@ -131,7 +129,14 @@ switch ($action) {
'actionId' => 1,
'newActionId' => 2,
'activeTab' => $activeTab++,
'actions' => array('view' => 'appMgmtData', 'edit' => 'appMgmtData', 'del' => 'appMgmtSave', 'pass' => 'usrUpdPass'));
'actions' => array(
'new' => array('title' => _('Nuevo Usuario'), 'action' => 'appMgmtData'),
'view' => array('title' => _('Ver Detalles de Usuario'), 'action' => 'appMgmtData'),
'edit' => array('title' => _('Editar Usuario'), 'action' => 'appMgmtData'),
'del' => array('title' => _('Eliminar Usuario'), 'action' => 'appMgmtSave'),
'pass' => array('title' => _('Cambiar Clave de Usuario'), 'action' => 'usrUpdPass')
)
);
echo '<DIV ID="tabs-1">';
$startTime = microtime();
@@ -146,7 +151,6 @@ switch ($action) {
if (SP_ACL::checkUserAccess("groups")) {
$arrGroupsTableProp = array(
'itemName' => _('Grupo'),
'tblId' => 'tblGroups',
'header' => '',
'tblHeaders' => array(_('Nombre'), _('Descripción')),
@@ -157,7 +161,12 @@ switch ($action) {
'actionId' => 3,
'newActionId' => 4,
'activeTab' => $activeTab++,
'actions' => array('edit' => 'appMgmtData', 'del' => 'appMgmtSave'));
'actions' => array(
'new' => array('title' => _('Nuevo Grupo'), 'action' => 'appMgmtData'),
'edit' => array('title' => _('Editar Grupo'), 'action' => 'appMgmtData'),
'del' => array('title' => _('Eliminar Grupo'), 'action' => 'appMgmtSave')
)
);
echo '<DIV ID="tabs-2">';
@@ -174,7 +183,6 @@ switch ($action) {
if (SP_ACL::checkUserAccess("profiles")) {
$arrProfilesTableProp = array(
'itemName' => _('Perfil'),
'tblId' => 'tblProfiles',
'header' => '',
'tblHeaders' => array(_('Nombre')),
@@ -185,7 +193,12 @@ switch ($action) {
'actionId' => 5,
'newActionId' => 6,
'activeTab' => $activeTab++,
'actions' => array('edit' => 'appMgmtData', 'del' => 'appMgmtSave'));
'actions' => array(
'new' => array('title' => _('Nuevo Perfil'), 'action' => 'appMgmtData'),
'edit' => array('title' => _('Editar Perfil'), 'action' => 'appMgmtData'),
'del' => array('title' => _('Eliminar Perfil'), 'action' => 'appMgmtSave')
)
);
echo '<DIV ID="tabs-3">';
@@ -223,7 +236,6 @@ switch ($action) {
if (SP_ACL::checkUserAccess("categories")) {
$arrCategoriesTableProp = array(
'itemName' => _('Categoría'),
'tblId' => 'tblCategories',
'header' => '',
'tblHeaders' => array(_('Nombre'), _('Descripción')),
@@ -234,7 +246,11 @@ switch ($action) {
'actionId' => 9,
'newActionId' => 10,
'activeTab' => $activeTab++,
'actions' => array('edit' => 'appMgmtData', 'del' => 'appMgmtSave')
'actions' => array(
'new' => array('title' => _('Nueva Categoría'), 'action' => 'appMgmtData'),
'edit' => array('title' => _('Editar Categoría'), 'action' => 'appMgmtData'),
'del' => array('title' => _('Eliminar Categoría'), 'action' => 'appMgmtSave')
)
);
echo '<DIV ID="tabs-1">';
@@ -252,7 +268,6 @@ switch ($action) {
if (SP_ACL::checkUserAccess("customers")) {
$arrCustomersTableProp = array(
'itemName' => _('Cliente'),
'tblId' => 'tblCustomers',
'header' => '',
'tblHeaders' => array(_('Nombre'), _('Descripción')),
@@ -263,7 +278,11 @@ switch ($action) {
'actionId' => 7,
'newActionId' => 8,
'activeTab' => $activeTab++,
'actions' => array('edit' => 'appMgmtData', 'del' => 'appMgmtSave')
'actions' => array(
'new' => array('title' => _('Nuevo Cliente'), 'action' => 'appMgmtData'),
'edit' => array('title' => _('Editar Cliente'), 'action' => 'appMgmtData'),
'del' => array('title' => _('Eliminar Cliente'), 'action' => 'appMgmtSave')
)
);
echo '<DIV ID="tabs-2">';

15
inc/html.class.php
View File

@@ -491,10 +491,11 @@ class SP_Html
public static function getQueryTable($arrTableProp, $queryItems)
{
$sk = SP_Common::getSessionKey(true);
$maxNumActions = 3;
echo '<div class="action fullWidth">';
echo '<ul>';
echo '<LI><img src="imgs/add.png" title="' . _('Nuevo') . ' ' . $arrTableProp['itemName'] . '" class="inputImg" OnClick="' . $arrTableProp["actions"]['edit'] . '(0,' . $arrTableProp["newActionId"] . ',\'' . $sk . '\',' . $arrTableProp["activeTab"] . ',0);" /></LI>';
echo '<LI><img src="imgs/add.png" title="' . $arrTableProp["actions"]['new']['title'] . '" class="inputImg" OnClick="' . $arrTableProp["actions"]['new']['action'] . '(0,' . $arrTableProp["newActionId"] . ',\'' . $sk . '\',' . $arrTableProp["activeTab"] . ',0);" /></LI>';
echo '</ul>';
echo '</div>';
@@ -525,7 +526,7 @@ class SP_Html
$intId = $item->$arrTableProp["tblRowSrcId"];
$action_check = array();
$numActions = count($arrTableProp["actions"]);
$classActionsOptional = ($numActions > 2) ? 'actions-optional' : '';
$classActionsOptional = ($numActions > $maxNumActions) ? 'actions-optional' : '';
echo '<ul>';
@@ -552,24 +553,24 @@ class SP_Html
foreach ($arrTableProp["actions"] as $action => $function) {
switch ($action) {
case "view":
echo '<img src="imgs/view.png" title="' . _('Ver Detalles') . '" class="inputImg" Onclick="return ' . $arrTableProp["actions"]['view'] . '(' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrTableProp["activeTab"] . ',1);" />';
echo '<img src="imgs/view.png" title="' . $arrTableProp['actions']['view']['title'] . '" class="inputImg" Onclick="return ' . $arrTableProp["actions"]['view']['action'] . '(' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrTableProp["activeTab"] . ',1);" />';
break;
case "edit":
echo '<img src="imgs/edit.png" title="' . _('Editar') . ' ' . $arrTableProp['itemName'] . '" class="inputImg" Onclick="return ' . $arrTableProp["actions"]['edit'] . '(' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrTableProp["activeTab"] . ',0);" />';
echo '<img src="imgs/edit.png" title="' . $arrTableProp['actions']['edit']['title'] . '" class="inputImg" Onclick="return ' . $arrTableProp["actions"]['edit']['action'] . '(' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrTableProp["activeTab"] . ',0);" />';
break;
case "del":
echo '<img src="imgs/delete.png" title="' . _('Eliminar') . ' ' . $arrTableProp['itemName'] . '" class="inputImg ' . $classActionsOptional . '" Onclick="return ' . $arrTableProp["actions"]['del'] . '(' . $arrTableProp["activeTab"] . ',1,' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', \'' . $arrTableProp["onCloseAction"] . '\');" />';
echo '<img src="imgs/delete.png" title="' . $arrTableProp['actions']['del']['title'] . '" class="inputImg ' . $classActionsOptional . '" Onclick="return ' . $arrTableProp["actions"]['del']['action'] . '(' . $arrTableProp["activeTab"] . ',1,' . $intId . ',' . $arrTableProp["actionId"] . ',\'' . $sk . '\', \'' . $arrTableProp["onCloseAction"] . '\');" />';
break;
case "pass":
if (isset($action_check['user_isLdap'])) {
break;
}
echo '<img src="imgs/key.png" title="' . _('Cambiar Clave') . '" class="inputImg ' . $classActionsOptional . '" Onclick="return ' . $arrTableProp["actions"]['pass'] . '(' . $intId . ');" />';
echo '<img src="imgs/key.png" title="' . $arrTableProp['actions']['pass']['title'] . '" class="inputImg ' . $classActionsOptional . '" Onclick="return ' . $arrTableProp["actions"]['pass']['action'] . '(' . $intId . ');" />';
break;
}
}
echo ($numActions > 2) ? '<img src="imgs/action.png" title="' . _('Más Acciones') . '" OnClick="showOptional(this)" />' : '';
echo ($numActions > $maxNumActions) ? '<img src="imgs/action.png" title="' . _('Más Acciones') . '" OnClick="showOptional(this)" />' : '';
echo '</li>';
echo '</ul>';
}