BugFixes.

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 97b93f19040631fa93b81c24549a2c38807c20ea..57331d5526739d7d5f0a6ace32711dc49347c9d5 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -30,7 +30,7 @@ elseif (($_SERVER['REQUEST_URI'] != "/sistemas/samurai/sel-sistema" &&
         !@$_SESSION['samurai']['id_sistema']) {
     header('Location: /sistemas/samurai/sel-sistema?redirect=index');    
 }
-elseif (@$_SESSION['samurai']['id_sistema']) {
+if (@$_SESSION['samurai']['id_sistema']) {
     //Creo el objeto Permiso
     $SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['usuario'],
             $_SESSION['samurai']['id_sistema'], $DB);

diff --git a/sistema/www/images/sistemas.gif b/sistema/www/images/sistemas.gif
index 15f40cac41d16265d852d9df69af855f4a351225..9e9da789521051f13f86a55723205a3da7265a7e 100644 (file)
Binary files a/sistema/www/images/sistemas.gif and b/sistema/www/images/sistemas.gif differ

diff --git a/sistema/www/images/sistemas_f2.gif b/sistema/www/images/sistemas_f2.gif
index c3b1668a8d5339aaf4341d8f44a5701405f9ac24..72388195c9fcc230bd4c668ffa5df15034985fff 100644 (file)
Binary files a/sistema/www/images/sistemas_f2.gif and b/sistema/www/images/sistemas_f2.gif differ

diff --git a/sistema/www/permisos/permisos-abm.php b/sistema/www/permisos/permisos-abm.php
index de5acc3fb3672c1f4e6082154d2e8b8f18b0782a..31637a2e7306f086802dd5d89c661b64d50cc8c9 100644 (file)
--- a/sistema/www/permisos/permisos-abm.php
+++ b/sistema/www/permisos/permisos-abm.php
@@ -26,6 +26,23 @@ if (!$SAMURAI_PERM->tiene(SAMURAI_PERM_DEVELOPER)) {
 }
 $MARCO =& new MECON_Marco ('/var/www/sistemas/samurai/sistema/conf/confSecciones.php', $SAMURAI_PERM);
 //}}}
+
+//XXX OBTENGO LA ACCION {{{
+switch ($_REQUEST['accion']) {
+    case 'm':
+        $b_accion = 'Modificar';
+        $accion = 'm';
+        break;
+    case 'e':
+        $b_accion = 'Eliminar';
+        $accion = 'e';
+        break;
+    default:
+        $b_accion = 'Grabar';
+        $accion = '';
+        break;
+}
+//}}}
     
 //REQUIRE_ONCE {{{    
     //MECON {{{
@@ -45,7 +62,8 @@ $MARCO =& new MECON_Marco ('/var/www/sistemas/samurai/sistema/conf/confSecciones
     $FORM->addElement ('hidden', 'id_permiso');
     $FORM->addElement ('text'  , 'desc_permiso', 'Descripción', array('size'=>'50'));
     $FORM->addElement ('hidden', 'responsable' , $_SESSION['usuario']);
-    $group[] = HTML_QuickForm::createElement('submit', 'aceptar' , 'Grabar');
+    $FORM->addElement ('hidden', 'accion', $accion);
+    $group[] = HTML_QuickForm::createElement('submit', 'aceptar', $b_accion);
     $group[] = HTML_QuickForm::createElement('button', 'cancelar', 'Cancelar', array ('onClick' => 'javascript:history.go(-1);return true;'));
     $FORM->addGroup($group,'botones');
 // }}}

diff --git a/sistema/www/sistemas/sistemas-abm.php b/sistema/www/sistemas/sistemas-abm.php
index 7311db3368d198f57f6c78649304bf727a290606..4481ac13a0007f9cb416e6dd10e35abdb42e2dbc 100644 (file)
--- a/sistema/www/sistemas/sistemas-abm.php
+++ b/sistema/www/sistemas/sistemas-abm.php
@@ -31,6 +31,23 @@
     require_once 'SAMURAI/Permiso.php';
     // }}}
 // }}}
+
+//XXX OBTENGO LA ACCION {{{
+switch ($_REQUEST['accion']) {
+    case 'm':
+        $b_accion = 'Modificar';
+        $accion = 'm';
+        break;
+    case 'e':
+        $b_accion = 'Eliminar';
+        $accion = 'e';
+        break;
+    default:
+        $b_accion = 'Grabar';
+        $accion = '';
+        break;
+}
+//}}}
 //VERIFICO SI SE TIENE ACCESO A LA PAGINA{{{
 $SAMURAI_PERM->setSistema(SAMURAI_PERM);
 if (!$SAMURAI_PERM->tiene(SAMURAI_PERM_DEVELOPER)) {
@@ -63,7 +80,8 @@ $MARCO =& new MECON_Marco ('/var/www/sistemas/samurai/sistema/conf/confSecciones
     $FORM->addElement ('textarea', 'contacto'            , 'Contacto'            , array('rows' => '2','cols'=>'50'));
     $FORM->addElement ('select'  , 'permisos'            , 'Permisos'            , $PERMISOS, array('size' => '5', 'multiple' => 'multiple'));
     $FORM->addElement ('hidden'  , 'responsable'         , $_SESSION['usuario']); 
-    $group[] = HTML_QuickForm::createElement('submit', 'aceptar' , 'Grabar');
+    $FORM->addElement ('hidden', 'accion', $accion);
+    $group[] = HTML_QuickForm::createElement('submit', 'aceptar', $b_accion);
     $group[] = HTML_QuickForm::createElement('submit', 'cancelar', 'Cancelar', array ('onClick' => 'javascript:window.location =\'sistemas\';return false;'));
     $FORM->addGroup($group,'botones');
 // }}}

diff --git a/sistema/www/sistemas/sistemas-datos.php b/sistema/www/sistemas/sistemas-datos.php
index a70828fbafc086aac71637019c0d10fbbb515185..53765f5277a43b1a7704a1799510c8c2f7606953 100644 (file)
--- a/sistema/www/sistemas/sistemas-datos.php
+++ b/sistema/www/sistemas/sistemas-datos.php
@@ -20,6 +20,7 @@
 // $Id$
 // 
 
+
 //VERIFICO SI SE TIENE ACCESO A LA PAGINA{{{
 $SAMURAI_PERM->setSistema(SAMURAI_PERM);
 if (!$SAMURAI_PERM->tiene(SAMURAI_PERM_DEVELOPER)) {