diff --git a/.gitattributes b/.gitattributes index 8fc0103639314bc2417b1d2595f473553acfa85b..f3fff85f7ff4d748bb7325ae655cb055e0eeaa11 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1760,7 +1760,6 @@ cosmogramme/sql/patch/patch_178.sql -text cosmogramme/sql/patch/patch_179.sql -text cosmogramme/sql/patch/patch_180.sql -text cosmogramme/sql/patch/patch_181.sql -text -cosmogramme/sql/patch/patch_182.sql -text cosmogramme/sql/patch/patch_183.sql -text cosmogramme/storm_init.php -text cosmogramme/tests/bootstrap.php -text diff --git a/application/modules/admin/controllers/UsersController.php b/application/modules/admin/controllers/UsersController.php index 2c4c2abf413d7fde40d80670e753657e89671bfc..1768a8fccd4cd662a9ce00a24c32103ec4e0eaf1 100644 --- a/application/modules/admin/controllers/UsersController.php +++ b/application/modules/admin/controllers/UsersController.php @@ -151,8 +151,7 @@ class Admin_UsersController extends ZendAfi_Controller_Action ->setAdresse($data['adresse']) ->setVille($data['ville']) ->setCodePostal($data['code_postal']) - ->setUserGroups($user_groups) - ->setObservations($data['observations']); + ->setUserGroups($user_groups); try { if ($user->save()) diff --git a/application/modules/admin/views/scripts/users/_form.phtml b/application/modules/admin/views/scripts/users/_form.phtml index ae2771f18b1d1f1fd6ef3eae7b7a4e39f4d11b29..17717172c4eed5243231e6a3a3ca87e0e153da0f 100644 --- a/application/modules/admin/views/scripts/users/_form.phtml +++ b/application/modules/admin/views/scripts/users/_form.phtml @@ -125,11 +125,6 @@ <td class="droite">Ville </td> <td class="gauche"><input type="text" name="ville" size="50" value="<?php echo $this->escape($this->user->getVille());?>"/></td> </tr> - <tr> - <td class="droite">Observations </td> - <td class="gauche"><textarea name="observations" rows="5"><?php echo $this->escape($this->user->getObservations());?></textarea></td> - </tr> - </table> </fieldset> diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php index 6022621bcef9478473f692c8d952ced2b2c8ed64..34dbc584d7877e74eeb0865db1a18e02d574a0e1 100644 --- a/cosmogramme/php/_init.php +++ b/cosmogramme/php/_init.php @@ -1,78 +1,77 @@ -<?PHP -// Constantes -define("VERSION_COSMOGRAMME","6.40"); -define("PATCH_LEVEL","183"); - -define("APPLI","cosmogramme"); -define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs"); -define("CRLF", chr(13) . chr(10)); -define("BR","<br />"); - -if (!function_exists('xdebug_break')) { - function xdebug_break(){}; -} - -date_default_timezone_set('Europe/Paris'); - -// Add cg: site= nom du site Opac (Ex: mabellebib.net) -$argc = isset($argc) ? $argc : 0; -if ($argc < 3) { - if (isset($_SERVER['SERVER_ADDR']) and $_SERVER['SERVER_ADDR'] != "127.0.0.1" and $_SERVER['SERVER_ADDR'] != "::1") - { - $site= "/" . substr($_SERVER['SCRIPT_NAME'], 1, strpos($_SERVER['SCRIPT_NAME'], "/" . APPLI . "/") -1) . "/" ; - $cfgfile= COSMOPATH . $site . APPLI . "/config.php" ; - } - else - { - $site= "/" ; - $cfgfile= "config.php"; - } -} - -if (!isset($cfgfile) || !file_exists($cfgfile)) { - $cfgfile="./config.php"; - $site = "/"; -} - -define("URL_BASE","http://" . $_SERVER["HTTP_HOST"] . $site . APPLI . "/"); -define("URL_IMG", URL_BASE ."images/"); - -// Includes -set_include_path(get_include_path().PATH_SEPARATOR.'./php/' . PATH_SEPARATOR . "./php/classes/"); - -require("fonctions/fonctions_base.php"); -require("fonctions/string.php"); -require("fonctions/erreur.php"); -require("fonctions/date_heure.php"); -require("fonctions/variables.php"); - -require_once(realpath(dirname(__FILE__)).'/../storm_init.php'); - -require("classe_sql.php"); -require("fonctions/sql.php"); - -// Lire la config -$cfg=lireConfig($cfgfile); - -// Add cg -if($argc == 4) chdir("../../../php/cosmo/"); - -// Mode web_service -if(strpos($_SERVER["REQUEST_URI"],"/web_services/")) $mode_web_service=true; - -// Connexion à la base de données -global $sql; -$sql=new sql($cfg["integration_server"],$cfg["integration_user"],$cfg["integration_pwd"],$cfg["integration_base"]); -//sqlExecute('set names "UTF8"'); -// Url pergame service -define("URL_SERVICE",getVariable("url_services")); - -// Session -if (!session_id()) - session_start(); - -// Controle login -if (isset($_REQUEST["action"]) && $_REQUEST['action'] == "logout") unset($_SESSION["passe"]); -if (!isset($_SESSION["passe"])) include("_identification.php"); - -?> +<?PHP +// Constantes +define("VERSION_COSMOGRAMME","6.40"); +define("PATCH_LEVEL","182"); +define("APPLI","cosmogramme"); +define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs"); +define("CRLF", chr(13) . chr(10)); +define("BR","<br />"); + +if (!function_exists('xdebug_break')) { + function xdebug_break(){}; +} + +date_default_timezone_set('Europe/Paris'); + +// Add cg: site= nom du site Opac (Ex: mabellebib.net) +$argc = isset($argc) ? $argc : 0; +if ($argc < 3) { + if (isset($_SERVER['SERVER_ADDR']) and $_SERVER['SERVER_ADDR'] != "127.0.0.1" and $_SERVER['SERVER_ADDR'] != "::1") + { + $site= "/" . substr($_SERVER['SCRIPT_NAME'], 1, strpos($_SERVER['SCRIPT_NAME'], "/" . APPLI . "/") -1) . "/" ; + $cfgfile= COSMOPATH . $site . APPLI . "/config.php" ; + } + else + { + $site= "/" ; + $cfgfile= "config.php"; + } +} + +if (!isset($cfgfile) || !file_exists($cfgfile)) { + $cfgfile="./config.php"; + $site = "/"; +} + +define("URL_BASE","http://" . $_SERVER["HTTP_HOST"] . $site . APPLI . "/"); +define("URL_IMG", URL_BASE ."images/"); + +// Includes +set_include_path(get_include_path().PATH_SEPARATOR.'./php/' . PATH_SEPARATOR . "./php/classes/"); + +require("fonctions/fonctions_base.php"); +require("fonctions/string.php"); +require("fonctions/erreur.php"); +require("fonctions/date_heure.php"); +require("fonctions/variables.php"); + +require_once(realpath(dirname(__FILE__)).'/../storm_init.php'); + +require("classe_sql.php"); +require("fonctions/sql.php"); + +// Lire la config +$cfg=lireConfig($cfgfile); + +// Add cg +if($argc == 4) chdir("../../../php/cosmo/"); + +// Mode web_service +if(strpos($_SERVER["REQUEST_URI"],"/web_services/")) $mode_web_service=true; + +// Connexion à la base de données +global $sql; +$sql=new sql($cfg["integration_server"],$cfg["integration_user"],$cfg["integration_pwd"],$cfg["integration_base"]); +//sqlExecute('set names "UTF8"'); +// Url pergame service +define("URL_SERVICE",getVariable("url_services")); + +// Session +if (!session_id()) + session_start(); + +// Controle login +if (isset($_REQUEST["action"]) && $_REQUEST['action'] == "logout") unset($_SESSION["passe"]); +if (!isset($_SESSION["passe"])) include("_identification.php"); + +?> diff --git a/cosmogramme/sql/patch/patch_182.sql b/cosmogramme/sql/patch/patch_182.sql deleted file mode 100644 index bbef169edf664a3f152d3b9a08487bc594e123a6..0000000000000000000000000000000000000000 --- a/cosmogramme/sql/patch/patch_182.sql +++ /dev/null @@ -1 +0,0 @@ -alter table bib_admin_users add column OBSERVATIONS TEXT; diff --git a/library/Class/Users.php b/library/Class/Users.php index 51fd66e662101aa62678c9cfc7f52a7e009c4d89..625fa26e1b72a2b4891814d00740c907addc50d1 100644 --- a/library/Class/Users.php +++ b/library/Class/Users.php @@ -278,10 +278,8 @@ class Class_Users extends Storm_Model_Abstract { 'is_contact_mail' => 0, 'ordreabon' => '', 'id_panier_courant' => 0]; - protected $_fiche_sigb; - public static function currentUserId() { if (!$user = self::getLoader()->getIdentity()) return 0; diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php index d6c11be9812d61f349764e5d0e5bccdb7a0bce25..c1978b782bd11045143e4220bb89b56e799fa9cd 100644 --- a/tests/application/modules/admin/controllers/UsersControllerTest.php +++ b/tests/application/modules/admin/controllers/UsersControllerTest.php @@ -56,8 +56,7 @@ abstract class UsersControllerWithMarcusTestCase extends AbstractControllerTestC ->setVille('Jazz City') ->setUserGroups([$group_vodeclic,$group_referent]) ->setCivilite(Class_Users::CIVILITE_MONSIEUR) - ->setIntBib(Class_IntBib::newInstanceWithId(1, ['comm_sigb' => 0])) - ->setObservations('Bon bassiste !'); + ->setIntBib(Class_IntBib::newInstanceWithId(1, ['comm_sigb' => 0])); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_UserGroup') ->whenCalled('findAllBy') @@ -185,10 +184,6 @@ class UsersControllerEditMarcusTest extends UsersControllerWithMarcusTestCase { public function testDateFin() { $this->assertQueryContentContains("td", '19-07-2010'); } - - public function testTextAreaObservationsContainsBonBassiste() { - $this->assertXPathContentContains('//textarea[@name="observations"]', 'Bon bassiste'); - } } @@ -245,7 +240,6 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas 'mobile' => '06 12 45 09 87', 'naissance' => '1976-02-17', 'id_items' => '22-25-e', - 'observations' => 'joli chapeau' )); $this->assertRedirectTo('/admin/users'); } @@ -329,11 +323,6 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas public function testUserGroupsAreReferentAndStagiaires() { $this->assertEquals([22, 25], $this->marcus->getUserGroupsIds()); } - - /** @test */ - public function objervationsShouldContainsJoliChapeau() { - $this->assertEquals('joli chapeau', $this->marcus->observations); - } } @@ -356,8 +345,7 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus 'ville' => '', 'naissance' => '', 'mobile' => '', - 'civilite' => 1, - 'observations' => '')); + 'civilite' => 1)); $this->assertAction('edit'); $this->assertQueryContentContains('span#abonne_erreur', "Vous devez compléter le champ 'Identifiant'"); $this->assertQueryContentContains('span#abonne_erreur', "Vous devez compléter le champ 'Mot de passe'"); @@ -383,8 +371,7 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus 'ville' => '', 'naissance' => '', 'mobile' => '', - 'civilite' => 1, - 'observations' => '')); + 'civilite' => 1)); $this->assertAction('edit'); $this->assertQueryContentContains('span#abonne_erreur', "Le champ 'Identifiant' doit être inférieur à 50 caractères"); @@ -432,8 +419,7 @@ class UsersControllerPostValidDataWithCommOpsysTest extends UsersControllerWithM 'ville' => '', 'naissance' => '', 'mobile' => '', - 'civilite' => 1, - 'observations' => '')); + 'civilite' => 1)); } @@ -582,8 +568,7 @@ class UsersControllerAddPostTest extends UsersControllerWithMarcusTestCase { 'ville' => '', 'naissance' => '', 'mobile' => '', - 'civilite' => 1, - 'observations' => ''))); + 'civilite' => 1))); $this->dispatch('/admin/users/add', true); } diff --git a/tests/library/Class/UsersTest.php b/tests/library/Class/UsersTest.php index 112eaab5b59bd8c6f6c6e653703f4b58d301e5aa..c02c86782b993746dfd9dd39a5361d2ca47790b9 100644 --- a/tests/library/Class/UsersTest.php +++ b/tests/library/Class/UsersTest.php @@ -236,8 +236,7 @@ class UsersTestSave extends ModelTestCase { 'mobile' => '', 'civilite' => 0, 'ordreabon' => '', - 'id_panier_courant' => 0, - 'observations' => '']); + 'id_panier_courant' => 0]); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Newsletter') ->whenCalled('findAllBy') @@ -285,8 +284,7 @@ class UsersTestSave extends ModelTestCase { 'mobile' => '', 'civilite' => 0, 'ordreabon' => '', - 'id_panier_courant' => 0, - 'observations' => ''], + 'id_panier_courant' => 0], 'id_user=\'34\''); Class_Users::getLoader()