diff --git a/VERSIONS b/VERSIONS
index 7d30cc80b3cffc56a42b32dbb91da7c9287d2df8..dc88df563b600384a20a4211be6911233c44c231 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,52 @@
+18/02/2016 - v7.4.11
+
+ - ticket #38716 : correction du répertoire de sauvegarde des images de captcha
+
+
+16/02/2016 - v7.4.10
+
+ - ticket #37996 : Correction des liens Premier Chapitre
+
+
+
+15/02/2016 - v7.4.9
+
+ - ticket #37288 : Correction de la localisation des exemplaires
+
+ - ticket #9366 : Administration : Correction du message d'indisponibilité
+
+ - ticket #35272 : Administration : Formulaire d'inscription : possibilité de paramétrer l'affichage des champs bibliothèque et numéro de carte
+
+
+
+11/02/2016 - v7.4.8
+
+ - ticket #37341 : Correction de l'affichage des types docs en résultat de recherche
+
+ - ticket #37440 : SSO 1DTouch : Prise en charge de la nouvelle adresse de ce fournisseur
+
+ - ticket #37100 : Performances: suppression du rendu AJAX des liens réseaux sociaux, optimisation des requêtes SQL pour les boîtes critiques, paniers et articles lorsqu'on est connecté en mode admin
+
+ - ticket #38336 : Administration: Correction de la version d'Imagick sur les serveurs hébergés par AFI et correction du déclenchement de l'indexaton des articles à la validation du formulaire
+
+ - ticket #33533 : Administration: correction de la navigation dans la modération des avis
+
+ - ticket #37199 : Administration : correction de la redirection dans la modération de formulaires
+
+ - ticket #38299 : Administration : Correction du bouton de suppression de boite pour toujours afficher la popup de confirmation
+
+ - ticket #38320 : Cosmogramme : Ajout d'une gestion d'erreur sur l'execution des différentes phases
+
+ - ticket #37078 : Cosmogramme : Correction du chemin de fichier généné lors de la génération de site Nanook
+
+
+
+08/02/2016 - v7.4.7
+
+ - ticket #38223 : Intégration cosmogramme : correction d'une incompatibilité avec la version 5.4.45 de PHP
+
+
+
05/02/2016 - v7.4.6
- ticket #36925 : Administration : correction du sélecteur de bibliothèque dans la fiche utilisateur
diff --git a/application/modules/admin/controllers/CmsController.php b/application/modules/admin/controllers/CmsController.php
index e7126cb4bf55bcef77cb7284ba17b7da4e499787..b03455d56e26b03e8aa37693b6c2c3ed5069b2f1 100644
--- a/application/modules/admin/controllers/CmsController.php
+++ b/application/modules/admin/controllers/CmsController.php
@@ -33,7 +33,8 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
'successful_add' => $this->_('L\'article "%s" a été sauvegardé'),
'successful_delete' => $this->_('Article "%s" supprimé')],
- 'actions' => ['add' => ['title' => $this->_("Ajouter un article")]]];
+ 'actions' => ['add' => ['title' => $this->_("Ajouter un article")]],
+ 'after_edit' => function ($model) { $model->index(); }];
}
@@ -47,11 +48,6 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
}
- protected function _postEditAction($article) {
- $article->index();
- }
-
-
protected function _getBibs() {
if (0 != $this->_bib->getId())
return [$this->_bib];
diff --git a/application/modules/admin/controllers/ModoController.php b/application/modules/admin/controllers/ModoController.php
index 4966ad2622308e9eb338b9fd21dbceec95baa966..965635873f71fd20b50a3f7a1a2baccdc6a66eea 100644
--- a/application/modules/admin/controllers/ModoController.php
+++ b/application/modules/admin/controllers/ModoController.php
@@ -27,7 +27,9 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
public function avisnoticeAction() {
- $this->subviewForStatus(0);
+ $status = $this->_getParam('status', 0);
+ $this->subviewForStatus($status);
+
$this->_request->setParam('back', 'avisnotice');
$this->_forward('index');
}
@@ -103,14 +105,8 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
'active_tab' => $active_tab]);
-}
- public function allreviewsAction() {
- $this->_request->setParam('back', 'avisnotice');
- $this->subviewForStatus(1);
- $this->_forward('index');
}
-
public function delavisnoticeAction() {
$id = $this->_request->getParam('id');
Class_AvisNotice::find($id)->delete();
@@ -119,7 +115,7 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
public function editavisnoticeAction() {
if (!$avis = Class_AvisNotice::find((int)$this->_request->getParam('id'))) {
- $this->_redirect('admin/modo/avisnotice');
+ $this->_redirectToAvisNotice();
return;
}
@@ -128,7 +124,7 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
->addPermalinkFor($avis);
if ($this->_editavisnoticePost($form, $avis)) {
- $this->_redirect('admin/modo/avisnotice');
+ $this->_redirectToAvisNotice();
return;
}
@@ -158,13 +154,26 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
public function validateavisnoticeAction() {
$id = $this->_request->getParam('id');
+
Class_AvisNotice::find($id)
->setModerationOK()
->save();
- $this->_redirect('admin/modo/avisnotice');
+
+ $this->_redirectToAvisNotice();
}
+ protected function _redirectToAvisNotice() {
+ $page = $this->_request->getParam('page', 0);
+ $active_tab = $this->_request->getParam('active_tab', 1);
+ $status = $this->_request->getParam('status', 0);
+
+ $this->_redirect('/admin/modo/avisnotice/status/' . $status .
+ '/active_tab/' . $active_tab .
+ '/page/' . $page);
+
+ }
+
public function deleteCmsAvisAction() {
$avis = Class_Avis::find($this->_getParam('id'));
$avis->delete();
@@ -768,7 +777,7 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
$formulaire_to_delete = Class_Formulaire::find($this->_getParam('id'));
$formulaire_to_delete->delete();
$this->_helper->notify($this->_('Formulaire supprimé'));
- $this->_redirect('admin/modo/formulaires/id_article/'.$formulaire_to_delete->getIdArticle());
+ $this->_redirect($this->_getReferer());
}
diff --git a/application/modules/admin/controllers/ModulesController.php b/application/modules/admin/controllers/ModulesController.php
index eea626f7e69f58bc3013fb25dc84e50956861690..2ba944397d49f310fbce2713f65a304c3b506054 100644
--- a/application/modules/admin/controllers/ModulesController.php
+++ b/application/modules/admin/controllers/ModulesController.php
@@ -44,8 +44,8 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
public function preDispatch() {
parent::preDispatch();
- if ($this->_request->getActionName()!='kiosque-change-data' &&
- $this->_request->getActionName()!='search-result')
+ if (!in_array($this->_request->getActionName(),
+ ['kiosque-change-data', 'search-result', 'auth-register']))
Zend_Layout::startMvc();
}
@@ -97,10 +97,26 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
public function authAction() {
+ if ('register' == $this->_getParam('action1'))
+ return $this->_forward('auth-register');
+
return $this->_simpleAction('auth_'.$this->_getParam('action1'));
}
+ public function authRegisterAction() {
+ $form = ZendAfi_Form_Configuration_AuthRegister::newConfigurationWith($this->preferences);
+ if ($this->_request->isPost() && $form->isValid($this->_request->getPost())) {
+ $datas = $form->getValues();
+ unset($datas['submit']);
+
+ return $this->updateEtRetour($datas);
+ }
+
+ $this->view->form = $form;
+ }
+
+
public function cmsAction() {
return $this->_simpleAction(($this->_getParam('action1') == 'articleviewbydate')
? 'cms_articleviewbydate' : 'cms_all');
diff --git a/application/modules/admin/controllers/PremierChapitreController.php b/application/modules/admin/controllers/PremierChapitreController.php
index e3c9aa79e2ca80ca083633230cffe4c2fb6b4b93..a521e3a416c3fa1d1cde36c4ad11f57590084e5d 100644
--- a/application/modules/admin/controllers/PremierChapitreController.php
+++ b/application/modules/admin/controllers/PremierChapitreController.php
@@ -18,9 +18,9 @@
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class Admin_PremierChapitreController extends Zend_Controller_Action {
- use Trait_Translator;
- protected $_baseUrlOptions = ['module' => 'admin', 'controller' => 'premier-chapitre'];
+class Admin_PremierChapitreController extends ZendAfi_Controller_Action {
+ protected $_baseUrlOptions = ['module' => 'admin', 'controller' => 'premier-chapitre'],
+ $_back_to_index;
private $active;
private $pc_bib_id;
@@ -35,6 +35,7 @@ class Admin_PremierChapitreController extends Zend_Controller_Action {
$this->pc_bmid = Class_AdminVar::get('PREMIERCHAPITRE_BMID');
$this->pc_bmkey = Class_AdminVar::get('PREMIERCHAPITRE_BMKEY');
$this->active = (!empty($this->pc_bib_id) && !empty($this->pc_bmid) && !empty($this->pc_bmkey));
+ $this->_back_to_index = $this->view->tagAnchor(['action' => 'index'] , $this->_('Retour à l\'index du service Premier-chapitre'));
}
public function preDispatch() {
@@ -73,11 +74,11 @@ class Admin_PremierChapitreController extends Zend_Controller_Action {
$data = $pc_ws->getDatafile();
if ($data){
$contenu = date('H:i:s')." Le référentiel a bien été téléchargé sur le serveur\nIl est possible de procéder à la mise à jour de la base\n";
- $contenu .= '<a href="/admin/premier-chapitre/maj-db/">Mise à jour de la base</a>';
+ $contenu .= $this->view->tagAnchor(['action' => 'maj-db'], $this->_('Mise à jour de la base'));
}
else $contenu = "Une erreur est survenue\nle référentiel n'a pas pu être téléchargé\nVeuillez réessayer ultérieurement";
$this->view->contenu = '<pre>'.$contenu.'</pre>';
- $this->view->contenu .= "<br/><a href='/admin/premier-chapitre/'>Retour à l'index du service Premier-chapitre</a>";
+ $this->view->contenu .= "<br/>" . $this->back_to_index;
$this->view->titre .= ' :: Téléchargement du référentiel';
}
@@ -92,11 +93,11 @@ class Admin_PremierChapitreController extends Zend_Controller_Action {
if ($data['new']) $contenu .= '* '.$data['new'].(($data['new']>1)?" ont été ajoutées":" a été ajoutée")."\n";
if ($data['maj']) $contenu .= '* '.$data['maj'].(($data['maj']>1)?" ont été mises":" a été mise")." à jour\n";
if ($data['err']) $contenu .= '* '.$data['err'].(($data['err']>1)?" erreurs n'ont pas été traitées":" erreur n'a pas été traitée")."\n";
- $contenu .= '<a href="/admin/premier-chapitre/link-notices/">Lier les notices</a>';
+ $contenu .= $this->view->tagAnchor(['action' => 'link-notices'], $this->_('Lier les notices'));
}
else $contenu = "Une erreur est survenue\nLa base n'a pu être mise à jour\nVeuillez réessayer ultérieurement";
$this->view->contenu = '<pre>'.$contenu.'</pre>';
- $this->view->contenu .= "<br/><a href='/admin/premier-chapitre/'>Retour à l'index du service Premier-chapitre</a>";
+ $this->view->contenu .= "<br/>" . $this->_back_to_index;
$this->view->titre .= ' :: Mise à jour de la base';
}
@@ -111,7 +112,7 @@ class Admin_PremierChapitreController extends Zend_Controller_Action {
}
else $contenu = "Une erreur est survenue\nLes liaisons n'ont pu être faites\nVeuillez réessayer ultérieurement";
$this->view->contenu = '<pre>'.$contenu.'</pre>';
- $this->view->contenu .= "<br/><a href='/admin/premier-chapitre/'>Retour à l'index du service Premier-chapitre</a>";
+ $this->view->contenu .= "<br/>" . $this->_back_to_index;
$this->view->titre .= ' :: Liaison aux notices';
}
diff --git a/application/modules/admin/views/scripts/accueil/premier-chapitre.phtml b/application/modules/admin/views/scripts/accueil/premier-chapitre.phtml
index 8c18b86fa5312e58c6d42eab972c0027e2dfa046..5ee9ef4ecb2b5c30b28340339e2ea7d32d6ea58f 100644
--- a/application/modules/admin/views/scripts/accueil/premier-chapitre.phtml
+++ b/application/modules/admin/views/scripts/accueil/premier-chapitre.phtml
@@ -18,7 +18,7 @@
pc_ref_url();
}
function pc_ref_url() {
- var urlref = "/premier-chapitre"
+ var urlref = baseUrl + "/premier-chapitre"
var type = $("#type")[0].value;
var format = $("#format")[0].value;
if (type == 0) {
@@ -92,7 +92,7 @@
<tr id="pc_conf_panier">
<td class="droite">Panier </td>
<td class="gauche"><?php echo $this->formSelect("id_panier", $this->preferences["id_panier"],['onchange'=>'pc_ref_url();'],$this->paniers) ?></td>
- </tr>
+ </tr>
<tr id="pc_conf_format">
<td class="droite" valign="top">Format d'affichage</td>
<td class="gauche">
diff --git a/application/modules/admin/views/scripts/modo/_avis_partial.phtml b/application/modules/admin/views/scripts/modo/_avis_partial.phtml
deleted file mode 100644
index d62871b971ccfd30203be4720ce61bb401a814fb..0000000000000000000000000000000000000000
--- a/application/modules/admin/views/scripts/modo/_avis_partial.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="<?php echo $this->item_class ?>">
- <?php
- $actions = ['validate', 'edit', 'del'];
- if ($this->avis->getFlags()>=0)
- $actions[] = ($this->avis->getFlags()==0) ? 'invisible' :'visible';
- $this->getHelper('avis')->setActions($actions); ?>
- <?php echo $this->avis($this->avis) ?>
- <div class='clear'></div>
-</div>
diff --git a/application/modules/admin/views/scripts/modo/avisnotice.phtml b/application/modules/admin/views/scripts/modo/avisnotice.phtml
index 5443bf7c18cc8271f90129bcc0edafa5818e8449..2723490bbf939b23a850fb09585ae5b1dfb325c7 100644
--- a/application/modules/admin/views/scripts/modo/avisnotice.phtml
+++ b/application/modules/admin/views/scripts/modo/avisnotice.phtml
@@ -1,11 +1,19 @@
<?php
if ($this->display_all)
echo $this->tag('h1', $this->_('Tous les avis de notices modérés')) .
- $this->tagAnchor(['action' => 'avisnotice'], $this->_('Afficher les avis non modérés'));
+ $this->tagAnchor(['action' => 'avisnotice',
+ 'status' => '0',
+ 'active_tab' => null,
+ 'page' => null],
+ $this->_('Afficher les avis non modérés'));
if (!$this->display_all)
echo $this->tag('h1', $this->_('Modération des avis sur les notices')) .
- $this->tagAnchor(['action' => 'allreviews'], $this->_('Afficher tous les avis modérés'));
+ $this->tagAnchor(['action' => 'avisnotice',
+ 'status' => '1',
+ 'active_tab' => null,
+ 'page' => null],
+ $this->_('Afficher tous les avis modérés'));
echo $this->tag('div',
diff --git a/application/modules/admin/views/scripts/modo/index.phtml b/application/modules/admin/views/scripts/modo/index.phtml
index b60b9b001c568520681f69aee05c75cfc2104446..c849f31edae5e6f1911ed7ec95cdd8f70931dc1e 100644
--- a/application/modules/admin/views/scripts/modo/index.phtml
+++ b/application/modules/admin/views/scripts/modo/index.phtml
@@ -4,19 +4,22 @@ $modstats = $moderer->getModerationStats();
$menus = [["icon" => "article.png",
"label" => "Articles",
- "url" => $this->url(['action' => 'aviscms']),
+ "url" => $this->url(['module' => 'admin', 'controller' => 'modo', 'action' => 'aviscms'], null, true),
"count" => $modstats['avis_articles']['count']],
+
["icon" => "books.png",
"label" => "Notices",
- "url" =>$this->url(['action' => 'avisnotice']),
+ "url" =>$this->url(['module' => 'admin', 'controller' => 'modo', 'action' => 'avisnotice'], null, true),
"count" => $modstats['avis_notices']['count']],
+
["icon" => "tag_blue.png",
"label" => "Tags notices",
- "url" => $this->url(['action' => 'tagnotice']),
+ "url" => $this->url(['module' => 'admin', 'controller' => 'modo', 'action' => 'tagnotice'], null, true),
"count" => $modstats['tags_notices']['count']],
+
["icon" => "traductions_16.png",
"label" => "Suggestions d'achat",
- "url" => $this->url(['action' => 'suggestion-achat']),
+ "url" => $this->url(['module' => 'admin', 'controller' => 'modo', 'action' => 'suggestion-achat'], null, true),
"count" => $modstats['suggestions_achat']['count']]
];
@@ -25,7 +28,7 @@ if (isset($modstats['formulaires'])) {
$menus[] =
["icon" => "formulaires_16.png",
"label" => "Formulaires",
- "url" => $this->url(['action' => 'formulaires', 'id_article' => null]),
+ "url" => $this->url(['action' => 'formulaires', 'id_article' => null, 'status' => null, 'active_tab' => null, 'page' => null]),
"count" => $modstats['formulaires']['count']]
;}
?>
diff --git a/application/modules/admin/views/scripts/modules/auth-register.phtml b/application/modules/admin/views/scripts/modules/auth-register.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..a77ca805bea2b10e567e9f4184a61fd9b389811a
--- /dev/null
+++ b/application/modules/admin/views/scripts/modules/auth-register.phtml
@@ -0,0 +1,4 @@
+<center>
+ <h1><?php echo $this->_('Propriétés du module : %s', $this->titre_module); ?></h1>
+ <?php echo $this->renderForm($this->form); ?>
+</center>
diff --git a/application/modules/admin/views/scripts/modules/auth_register.phtml b/application/modules/admin/views/scripts/modules/auth_register.phtml
deleted file mode 100644
index bc4491adc28ae12683d0d1ea856bc5fcc05d3d19..0000000000000000000000000000000000000000
--- a/application/modules/admin/views/scripts/modules/auth_register.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php echo $this->render('modules/_debut.phtml');?>
-
-<br>
-<fieldset>
- <legend>Préférences</legend>
- <table cellspacing="2">
-
- <tr>
- <td class="droite">Titre </td>
- <td class="gauche"><input type="text" name="titre" size="40" value="<?php print($this->preferences["titre"]); ?>"></td>
- </tr>
- <tr>
- <td class="droite">Texte d'aide </td>
- <td class="gauche"><textarea cols="70" rows="5" name="register_help"><?php print($this->preferences["register_help"]); ?></textarea></td>
- </tr>
- <tr>
- <td class="droite">Texte de confirmation </td>
- <td class="gauche"><textarea cols="70" rows="5" name="register_confirm"><?php print($this->preferences["register_confirm"]); ?></textarea></td>
- </tr>
-
-
- </table>
-</fieldset>
-
-<?php echo $this->render('modules/_fin.phtml');?>
-
diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php
index 64862e20875a6dc1ddb5781c73174eca6e3f8dd7..bbcd1e00fa68d78a64080384662628723278e4ad 100644
--- a/application/modules/opac/controllers/AuthController.php
+++ b/application/modules/opac/controllers/AuthController.php
@@ -205,60 +205,22 @@ class AuthController extends ZendAfi_Controller_Action {
public function registerAction() {
- $this->view->preferences = Class_Profil::getCurrentProfil()->getCfgModulesPreferences('auth', 'register');
- if (Class_AdminVar::get('INTERDIRE_ENREG_UTIL'))
+ if (Class_AdminVar::get('INTERDIRE_ENREG_UTIL')) {
$this->_redirect('/');
+ return;
+ }
+
+ $this->view->preferences = Class_Profil::getCurrentProfil()->getCfgModulesPreferences('auth', 'register');
+
+ $this->view->form = new ZendAfi_Form_Register();
- $this->view->form = ZendAfi_Form::newWithOptions(['action' => $this->view->url(['module'=>'opac',
- 'controller'=>'auth',
- 'action'=>'register'])])
-
- ->addElement('text', 'login', ['label' => $this->view->_('Identifiant'),
- 'maxlength' => 20,
- 'required' => true,
- 'validators' => ['LoginExists']])
-
- ->addElement('password', 'mdp', ['label' => $this->view->_('Mot de passe'),
- 'maxlength' => 15,
- 'required' => true])
-
- ->addElement('password', 'mdp2', ['label' => $this->view->_('Confirmez votre mot de passe'),
- 'maxlength' => 15,
- 'required' => true,
- 'validators' => [new ZendAfi_Validate_PasswordEquals('mdp')]])
-
- ->addElement('email', 'mail', ['label' => $this->view->_('E-mail'),
- 'maxlength' => 50,
- 'required' => true,
- 'validators' => ['MailExists']])
-
- ->addElement('email', 'mail2', ['label' => $this->view->_('Confirmez votre e-mail'),
- 'maxlength' => 50,
- 'required' => true,
- 'validators' => [new ZendAfi_Validate_MailEquals('mail')]])
-
- ->addDisplayGroup(['login', 'mdp', 'mdp2', 'mail', 'mail2'],
- 'fields',
- ['legend' => ''])
-
- ->addElement('captcha', 'captcha', array('captcha' => 'Image',
- 'label' => $this->view->_('Recopiez le code'),
- 'captchaOptions' => array('font' => PATH_FONTS.'/Vera.ttf',
- 'imgDir' => PATH_CAPTCHA,
- 'imgUrl' => URL_CAPTCHA)))
- ->addDisplayGroup(['captcha'],
- 'security',
- ['legend' => $this->view->_('Sécurité'),
- 'required' => true])
- ->addElement('submit','submit', ['label' => $this->view->_('Valider')]);
-
-
- if ($this->_request->isPost() && $this->view->form->isValid($this->_request->getPost())) {
- // recup _post
+
+ if ($this->_request->isPost()
+ && $this->view->form->isValid($this->_request->getPost())) {
$data = ZendAfi_Filters_Post::filterStatic($this->_request->getPost());
$class_user = new Class_Users();
$data['cle'] = md5($data['mail']);
- $ret=$class_user->registerUser($data);
+ $ret = $class_user->registerUser($data);
// Affichage des erreurs
if(isset($ret["error"])) {
@@ -357,7 +319,6 @@ class AuthController extends ZendAfi_Controller_Action {
}
-
public function activeuserAction() {
if (!$cle = $this->_request->getParam('c'))
$this->_redirect('/');
diff --git a/application/modules/opac/controllers/PremierChapitreController.php b/application/modules/opac/controllers/PremierChapitreController.php
index 498c04bb5f4abd668b3311234cd49930aa232bae..56a65a0e1e9c482c09e38c5b32bc728ede49e67e 100644
--- a/application/modules/opac/controllers/PremierChapitreController.php
+++ b/application/modules/opac/controllers/PremierChapitreController.php
@@ -71,13 +71,13 @@ class PremierChapitreController extends Zend_Controller_Action {
$pc = Class_PremierChapitre::findFirstBy(['ean' => $ean]);
if ($pc) {
$ntc = $pc->getNotice();
- $url_notice = ZendAfi_View_Helper_UrlNotice::urlNotice($ntc);
+ $url_notice = Class_Url::absolute(ZendAfi_View_Helper_UrlNotice::urlNotice($ntc));
$this->_redirect($url_notice);
}
- else
+ else
$this->_redirect('/');
}
- else
+ else
$this->_redirect('/');
}
@@ -107,7 +107,7 @@ class PremierChapitreController extends Zend_Controller_Action {
$format = $this->_request->getParam('format');
if (!preg_match('@^\d+$@',$nb))
$pcs = Class_PremierChapitre::getAleatoire();
- else
+ else
$pcs = Class_PremierChapitre::getAleatoire($nb);
$preferences = [];
if ($format == 1 || $format == 2) $preferences['target'] = 'frame';
@@ -139,7 +139,7 @@ class PremierChapitreController extends Zend_Controller_Action {
$this->getResponse()->setHeader('Pragma', 'no-cache', true);
$this->getResponse()->setBody($html . Class_ScriptLoader::getInstance()->loadJQuery()->html());
}
-
+
public function __call($method, $args) {
if ('Action' == substr($method, -6)) {
// Si une méthode d'action n'est pas trouvée,
diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php
index 868321cd27f6b7befa9397325bb51eda02e17614..baae09033cb3616d89ff87ad554069958cea4e91 100644
--- a/application/modules/opac/controllers/RechercheController.php
+++ b/application/modules/opac/controllers/RechercheController.php
@@ -419,14 +419,6 @@ class RechercheController extends ZendAfi_Controller_Action {
}
- public function reseauAction() {
- $viewRenderer = $this->getHelper('ViewRenderer');
- $viewRenderer->setNoRender();
-
- echo $this->view->reseauxSociaux(Class_Notice::find($this->_getParam('id_notice', 0)));
- }
-
-
public function vignetteAction() {
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->setNoRender();
diff --git a/application/modules/opac/views/scripts/head.phtml b/application/modules/opac/views/scripts/head.phtml
index f04ea1841710a1aa8873154b8cf993dd6f8f4de7..9005e147654e2462fb275344f76bdb9cf534fd8d 100644
--- a/application/modules/opac/views/scripts/head.phtml
+++ b/application/modules/opac/views/scripts/head.phtml
@@ -38,7 +38,6 @@
initializeImgHover();
initializePopups();
initializeDivisionFive();
- initializeReseauxSociaux();
initializeReloadModule();')
->addJQueryBackEnd(sprintf('$("#select_clef_profil").parent().prepend(\'%s\')',
$this->tagImg(URL_ADMIN_IMG.'ico/lock.png',
diff --git a/application/modules/opac/views/scripts/index/sitedown.phtml b/application/modules/opac/views/scripts/index/sitedown.phtml
index 604c663041dfad71587637c88195f4f0841fcced..404033260a98274ba9f27aad8a82e07c3882b7ef 100644
--- a/application/modules/opac/views/scripts/index/sitedown.phtml
+++ b/application/modules/opac/views/scripts/index/sitedown.phtml
@@ -2,11 +2,11 @@
<div style="margin-top:70px;margin-bottom:150px;">
<h2 id="error">
<p class="erreur">
-<?php
+<?php
-print($this->traduire("L'accès au site est momentanément bloqué.<br><br> Veuillez essayez plus tard."));
+print($this->traduire("L'accès au site est momentanément bloqué.<br><br> Veuillez essayer plus tard."));
?>
</p>
</h2>
</div>
-</center>
\ No newline at end of file
+</center>
diff --git a/application/modules/opac/views/scripts/premier-chapitre/index.phtml b/application/modules/opac/views/scripts/premier-chapitre/index.phtml
index f1e43c1af948e25fae44ebae62eeda0f30342e37..7d9acfa910bd35ec695cc11537d9507eccbaa696 100644
--- a/application/modules/opac/views/scripts/premier-chapitre/index.phtml
+++ b/application/modules/opac/views/scripts/premier-chapitre/index.phtml
@@ -10,7 +10,7 @@
<div>
<p><img src="/public/opac/images/lireavecpremierchapitre.png" alt="premierchapitre" style="position:relative;top:-5px;"></p>
<p><span style="font-size:12px">Cliquez sur une couverture pour lire un extrait. Vous pouvez ensuite récupérer le livre à la bibliothèque.</span></p>
- <p><span style="font-size:12px"><a href="/premier-chapitre/liste-complete/">Cliquez ici Pour voir la liste complète <img src="/public/opac/images/buttons/2rightarrow.png"></a></span></p>
+ <p><span style="font-size:12px"><?php echo $this->tagAnchor(['action' => 'liste-complete'], $this->_('Cliquez ici pour voir la liste complète') . '<img src="/public/opac/images/buttons/2rightarrow.png">')?> </span></p>
</div>
<?php echo $this->premierChapitre_Vignettes($this->pc_ids,['target' => 'frame', 'linkNotice' => 1]); ?>
</div>
diff --git a/application/modules/opac/views/scripts/recherche/viewnotice.phtml b/application/modules/opac/views/scripts/recherche/viewnotice.phtml
index 5b18296b9f92135faae7f3fae7efafb542bbd5c6..558fb0ab8d336a64c66b8769cf3ff58cacae71f1 100644
--- a/application/modules/opac/views/scripts/recherche/viewnotice.phtml
+++ b/application/modules/opac/views/scripts/recherche/viewnotice.phtml
@@ -12,13 +12,7 @@ $script_loader = Class_ScriptLoader::getInstance()
->addSkinstylesheet('recherche')
->addOpacScripts(['subModal',
'recherche',
- 'liste_notices_mur'])
-
- ->addJQueryReady(sprintf('$("#reseaux-sociaux").load("%s")',
- $this->url(['controller' => 'recherche',
- 'action' => 'reseau',
- 'id_notice' => $this->notice->getId(),
- 'type_doc' => $this->notice->getTypeDoc()])));
+ 'liste_notices_mur']);
?>
<div class="navigation">
@@ -65,7 +59,7 @@ $script_loader = Class_ScriptLoader::getInstance()
$this->_('Modifier la vignette'));
?>
- <div id="reseaux-sociaux"></div>
+ <div id="reseaux-sociaux"><?php echo $this->reseauxSociaux($this->notice); ?></div>
</div>
diff --git a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
index 99a242715fb3c6fb851471db725d5d9cd673cbf5..ddf0d1d9dcac6be17e10aeb3cd54a062fd888c16 100644
--- a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
+++ b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
@@ -426,7 +426,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
'rang' => 2001,
'profil' => $profile->getId(),
'type_operation' => Class_IntMajAuto::OP_ITEMS_DELETION,
- 'nom_fichier' => '../ftp/transfert/library1/site20/suppressions.txt']));
+ 'nom_fichier' => 'library1/site20/suppressions.txt']));
}
@@ -435,7 +435,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => 104,
'type_operation' => Class_IntMajAuto::OP_FULL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/notices_total.txt']));
+ 'nom_fichier' => 'library1/site20/notices_total.txt']));
}
@@ -444,7 +444,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => 104,
'type_operation' => Class_IntMajAuto::OP_PARTIAL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/notices.txt']));
+ 'nom_fichier' => 'library1/site20/notices.txt']));
}
@@ -453,7 +453,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => 105,
'type_operation' => Class_IntMajAuto::OP_FULL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/abonnes.txt']));
+ 'nom_fichier' => 'library1/site20/abonnes.txt']));
}
@@ -462,7 +462,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => 102,
'type_operation' => Class_IntMajAuto::OP_FULL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/prets.txt']));
+ 'nom_fichier' => 'library1/site20/prets.txt']));
}
@@ -471,7 +471,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => 103,
'type_operation' => Class_IntMajAuto::OP_FULL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/reservations.txt']));
+ 'nom_fichier' => 'library1/site20/reservations.txt']));
}
@@ -494,7 +494,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => $profile->getId(),
'type_operation' => Class_IntMajAuto::OP_FULL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/paniers_total.txt']));
+ 'nom_fichier' => 'library1/site20/paniers_total.txt']));
}
@@ -506,7 +506,7 @@ class Cosmo_IntegrationControllerGenerateActionNanookPostTest
$this->assertNotNull(Class_IntMajAuto::findFirstBy(['id_bib' => 20,
'profil' => $profile->getId(),
'type_operation' => Class_IntMajAuto::OP_PARTIAL_IMPORT,
- 'nom_fichier' => '../ftp/transfert/library1/site20/paniers.txt']));
+ 'nom_fichier' => 'library1/site20/paniers.txt']));
}
diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php
index 783024abbb2f279af2632dcbcf42886ac15ba372..0f5feab41d92a48b8726d9eb9101290b90eb0537 100644
--- a/cosmogramme/php/_init.php
+++ b/cosmogramme/php/_init.php
@@ -1,7 +1,7 @@
<?php
error_reporting(E_ERROR | E_PARSE);
-define("PATCH_LEVEL","286");
+define("PATCH_LEVEL","287");
define("APPLI","cosmogramme");
define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs");
diff --git a/cosmogramme/php/integration/integration_phase.php b/cosmogramme/php/integration/integration_phase.php
index 3927cb0326103cdd5cab7b38eb43ce29f86ef810..db3877a85afa0eb20ff6f2eda89e83cbb5970fcc 100644
--- a/cosmogramme/php/integration/integration_phase.php
+++ b/cosmogramme/php/integration/integration_phase.php
@@ -46,9 +46,7 @@ function startIntegrationPhase($name) {
$current_chrono->backToLegacyState($chrono, $chrono_fichier, $chrono100notices);
$new_phase->backToLegacyState($phase, $phase_data, $mode_cron, $reprise, $compteur);
-
if (!$mode_cron && $requested_phase->isTimeOut())
sauveContexte();
}
-
?>
\ No newline at end of file
diff --git a/cosmogramme/sql/patch/patch_287.php b/cosmogramme/sql/patch/patch_287.php
new file mode 100644
index 0000000000000000000000000000000000000000..58f6b24e70a9055e5e62d8e66bb7434ee35b1ed3
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_287.php
@@ -0,0 +1,11 @@
+<?php
+$adapter = Zend_Db_Table::getDefaultAdapter();
+
+$column_adder = function($column) use ($adapter) {
+ try {
+ $adapter->query('ALTER TABLE bib_admin_users_non_valid ADD COLUMN ' . $column);
+ } catch(Exception $e) {}
+};
+
+$column_adder('id_site smallint(6) null');
+$column_adder('idabon varchar(20) null');
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 63e15b4a6070948e6e06cce39fa807f9098ed622..c836f90a21276d0867c2b84df2afd9e16ffff218 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -255,6 +255,10 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
'MYCOW_EID' => Class_AdminVar_Meta::newDefault($this->_('Clé d\'identification MyCOW.EU pour le portail. Cette clé doit être fournie par MyCOW.EU. Elle active la ressource numérique dans le portail.'))->bePrivate(),
'ONEDTOUCH_URL' => Class_AdminVar_Meta::newDefault($this->_('Adresse du serveur OAI 1D touch'))->bePrivate(),
+ 'ONEDTOUCH_VERSION_URL' => Class_AdminVar_Meta::newCombo( $this->_('Type de SSO OneDTouch'),
+ ['options' => ['selectOptions' => ['label' => $this->_('Version'),
+ 'multioptions' => (new Class_OneDTouchLink())->getVersionOptions()]]])->bePrivate(),
+
'ONEDTOUCH_ID' => Class_AdminVar_Meta::newDefault($this->_('Identifiant du portail chez 1D touch'))->bePrivate(),
'ORPHEA_URL' => Class_AdminVar_Meta::newDefault($this->_('Adresse du serveur Orphea'))->bePrivate(),
diff --git a/library/Class/AvisNotice.php b/library/Class/AvisNotice.php
index 40ee037040c0c28ad645947b50ac6854278856ce..2c4de8af80267abd9d0f9d01d934965a18933300 100644
--- a/library/Class/AvisNotice.php
+++ b/library/Class/AvisNotice.php
@@ -161,7 +161,7 @@ class AvisNoticeLoader extends Storm_Model_Loader {
$params['flags'] = Class_AvisNotice::NO_FLAG;
$preferences = array_merge(['id_panier' => 0,
'id_catalogue' => 0,
- 'abon_ou_bib' => 'all',
+ 'abon_ou_bib' => 'all'
],
$preferences);
@@ -175,8 +175,12 @@ class AvisNoticeLoader extends Storm_Model_Loader {
$this->_addStatutAbonBibWhereClause($abon_ou_bib, $params);
- if ($limit_page)
- $params['limitPage'] = $limit_page;
+ if (!isset($preferences['nb_aff_avis']))
+ $preferences['nb_aff_avis'] = 10;
+
+ $params['limitPage'] = $limit_page
+ ? $limit_page
+ : [1, $preferences['nb_aff_avis'] * 3];
return Class_AvisNotice::findAllBy($params);
}
diff --git a/library/Class/Cosmogramme/Generator.php b/library/Class/Cosmogramme/Generator.php
index f96e6265ce8f01c576e08ae7ab4a1d3f3338139e..65444446c19cb7c9eb810e2287bcfdd554e20086 100644
--- a/library/Class/Cosmogramme/Generator.php
+++ b/library/Class/Cosmogramme/Generator.php
@@ -181,8 +181,8 @@ class Class_Cosmogramme_Generator {
$id_bib = $elem[0];
Class_IntMajAuto::deleteBy(['id_bib' => $id_bib]);
- $base_path = $this->_landing_directory->getSubdirPath($this->_params['path_ftp']);
- return $this->getPlannedGenerator()->plan($id_bib, $base_path);
+ $lib_label = trim($elem[1]);
+ return $this->getPlannedGenerator()->plan($id_bib, $lib_label);
}
diff --git a/library/Class/Cosmogramme/Integration/Chronometre.php b/library/Class/Cosmogramme/Integration/Chronometre.php
index 485131f7085fcaef99ca93bb963131314d7ecdb1..369a1b4c1a20ea0dbd779c8cb43b3325a0c86c04 100644
--- a/library/Class/Cosmogramme/Integration/Chronometre.php
+++ b/library/Class/Cosmogramme/Integration/Chronometre.php
@@ -39,10 +39,9 @@ class Class_Cosmogramme_Integration_Chronometre {
public function backToLegacyState($main, $on_file, $on_records) {
- foreach ([$main => $this->_main,
- $on_file => $this->_on_file,
- $on_records => $this->_on_records] as $legacy => $internal)
- $legacy->timeStart = $internal->getStart();
+ $main->timeStart = $this->_main->getStart();
+ $on_file->timeStart = $this->_on_file->getStart();
+ $on_records->timeStart = $this->_on_records->getStart();
}
diff --git a/library/Class/Cosmogramme/Integration/PhaseAbstract.php b/library/Class/Cosmogramme/Integration/PhaseAbstract.php
index e7d2935c27d167c01d5d8dbc5806c0694f732c6d..7f74223fd1fa11c3745231c90df20041ca061bea 100644
--- a/library/Class/Cosmogramme/Integration/PhaseAbstract.php
+++ b/library/Class/Cosmogramme/Integration/PhaseAbstract.php
@@ -23,8 +23,13 @@
abstract class Class_Cosmogramme_Integration_PhaseAbstract {
use Trait_TimeSource, Trait_StaticFileSystem, Trait_Translator, Trait_MemoryCleaner;
- protected $_label = '';
- protected $_phase, $_log, $_printer, $_chrono, $_is_time_out;
+ protected $_label = '',
+ $_phase,
+ $_log,
+ $_printer,
+ $_chrono,
+ $_is_time_out,
+ $_db_reset = true;
public function __construct($phase, $log, $chrono) {
@@ -83,7 +88,14 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
$this->_printLabel();
- $this->_execute();
+ try {
+ $this->_execute();
+ } catch (Exception $e) {
+ $this->_log->ecrire('<p class="rouge">' . sprintf('Erreur lors de l\'execution de la phase %s : </br>%s',
+ $this->_label,
+ $e->getMessage()) . '</p>');
+ $this->_cleanMemory();
+ }
return $this->_phase;
}
@@ -160,4 +172,11 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
gc_collect_cycles();
return $this;
}
+
+
+ /** @category testing */
+ public function noDbReset() {
+ $this->_db_reset = false;
+ return $this;
+ }
}
\ No newline at end of file
diff --git a/library/Class/Cosmogramme/Integration/PhaseBatchs.php b/library/Class/Cosmogramme/Integration/PhaseBatchs.php
index 8bb8714e42e16a16365b50f96011055f5cc2e77e..56106347c28881d061e6e749f352ff6479761d9d 100644
--- a/library/Class/Cosmogramme/Integration/PhaseBatchs.php
+++ b/library/Class/Cosmogramme/Integration/PhaseBatchs.php
@@ -44,6 +44,8 @@ class Class_Cosmogramme_Integration_PhaseBatchs
$this->_resetHttpClient()
->_runOne($batch);
+
+ $this->_cleanMemory();
}
}
diff --git a/library/Class/Cosmogramme/Integration/PhaseItemFacets.php b/library/Class/Cosmogramme/Integration/PhaseItemFacets.php
index 1c40d36af5d451131ee267fcb82902a57dd4932b..829bef1673fc8da0b04a03111bb78b29f8620408 100644
--- a/library/Class/Cosmogramme/Integration/PhaseItemFacets.php
+++ b/library/Class/Cosmogramme/Integration/PhaseItemFacets.php
@@ -39,6 +39,8 @@ class Class_Cosmogramme_Integration_PhaseItemFacets
public function _execute() {
while ($records = Class_Notice::findAllAfter($this->_getData('pointeur_notice'),
$this->_getData('pointeur'))) {
+ if ($this->isTimeOut())
+ return $this->_phase;
if (0 == ($this->_getData('nombre') % 100))
$this->_log->ecrire('<span class="vert"> ' . $this->_getData('nombre') . ' records updated </span>');
@@ -52,6 +54,7 @@ class Class_Cosmogramme_Integration_PhaseItemFacets
$this->runUpdateForRecords($records);
$this->_resetDbConnection();
+ $this->_cleanMemory();
}
Class_CosmoVar::setValueOf('date_maj_facettes', $this->_last_update_date);
@@ -121,12 +124,4 @@ class Class_Cosmogramme_Integration_PhaseItemFacets
protected function _wasRunning() {
return $this->_getData('pointeur_notice') > 0;
}
-
-
- /** @category testing */
- public function noDbReset() {
- $this->_db_reset = false;
- return $this;
- }
}
-?>
\ No newline at end of file
diff --git a/library/Class/Cosmogramme/Integration/PhaseOnDataSource.php b/library/Class/Cosmogramme/Integration/PhaseOnDataSource.php
index c95a715ac56c486db59f119416e46093dde947ee..ff2634035af6ca41518af06480a51ec6b1d259d3 100644
--- a/library/Class/Cosmogramme/Integration/PhaseOnDataSource.php
+++ b/library/Class/Cosmogramme/Integration/PhaseOnDataSource.php
@@ -30,6 +30,7 @@ abstract class Class_Cosmogramme_Integration_PhaseOnDataSource extends Class_Cos
return $this->_phase;
$this->_runOne($integration);
+ $this->_cleanMemory();
}
$this->_setData('pointeur', 0);
diff --git a/library/Class/Cosmogramme/Integration/PhasePseudoRecord.php b/library/Class/Cosmogramme/Integration/PhasePseudoRecord.php
index 8e91dc3e70a4e7c4f3421f4b1e3e129804557e80..3ead13c40dc59b242cb8867285249f7a2300f00b 100644
--- a/library/Class/Cosmogramme/Integration/PhasePseudoRecord.php
+++ b/library/Class/Cosmogramme/Integration/PhasePseudoRecord.php
@@ -54,6 +54,7 @@ abstract class Class_Cosmogramme_Integration_PhasePseudoRecord
return;
$this->_runPage($models);
+ $this->_cleanMemory();
}
$this->_summarize();
diff --git a/library/Class/Cosmogramme/Integration/PhaseReviews.php b/library/Class/Cosmogramme/Integration/PhaseReviews.php
index 0492474e46662dceb6f5928e19f1eea3a112affd..6a465b155e7bd19f03de2c3f64cfda24c559431d 100644
--- a/library/Class/Cosmogramme/Integration/PhaseReviews.php
+++ b/library/Class/Cosmogramme/Integration/PhaseReviews.php
@@ -23,7 +23,6 @@ class Class_Cosmogramme_Integration_PhaseReviews extends Class_Cosmogramme_Integ
const MY_ID=7.5;
protected $_label = 'Reviews attachments';
- protected $_db_reset=true;
public function __construct($phase, $log, $chrono) {
parent::__construct($phase, $log, $chrono);
@@ -52,7 +51,9 @@ class Class_Cosmogramme_Integration_PhaseReviews extends Class_Cosmogramme_Integ
public function _execute() {
$page = 1;
while ($records = Class_AvisNotice::findAllBy(['order' => 'id',
- 'limitPage' => [$page, 500]])) {
+ 'limitPage' => [$page, 100]])) {
+ if ($this->isTimeOut())
+ return $this->_phase;
if ($this->_log && (0 == ($this->_getData('nombre') % 100)))
$this->_log->ecrire('<span class="vert"> ' . $this->_getData('nombre') . ' avis mis à jour </span>');
@@ -60,7 +61,7 @@ class Class_Cosmogramme_Integration_PhaseReviews extends Class_Cosmogramme_Integ
$this->runUpdateForRecords($records);
$this->_resetDbConnection();
-
+ $this->_cleanMemory();
$page++;
}
@@ -76,7 +77,6 @@ class Class_Cosmogramme_Integration_PhaseReviews extends Class_Cosmogramme_Integ
$this->_log->ecrire($msg);
}
-
}
@@ -97,23 +97,4 @@ class Class_Cosmogramme_Integration_PhaseReviews extends Class_Cosmogramme_Integ
$this->_incrementData('nombre');
}
-
- /** @category testing */
- public function noDbReset() {
- $this->_db_reset = false;
- return $this;
- }
-
- protected function _resetDbConnection() {
- if (!$this->_db_reset)
- return $this;
-
- Storm_Model_Abstract::unsetLoaders();
- Zend_Db_Table::getDefaultAdapter()->closeConnection();
- setupDatabase(loadConfig());
- gc_collect_cycles();
- return $this;
- }
-
-
}
\ No newline at end of file
diff --git a/library/Class/Exemplaire.php b/library/Class/Exemplaire.php
index 618854ad9b72a58672fe5373b44d6e7bb08edb72..1486ef51fe4ac1c33ee7322542019af8292f6137 100644
--- a/library/Class/Exemplaire.php
+++ b/library/Class/Exemplaire.php
@@ -80,9 +80,9 @@ class Class_Exemplaire extends Storm_Model_Abstract {
public function getBestCote() {
- if($this->_sigb_exemplaire &&
- ($sigb_cote = $this->_sigb_exemplaire->getCote()) &&
- (strlen($sigb_cote) > strlen($this->getCote())))
+ if ($this->getSigbExemplaire() &&
+ ($sigb_cote = $this->getSigbExemplaire()->getCote()) &&
+ (strlen($sigb_cote) > strlen($this->getCote())))
return $sigb_cote;
return $this->getCote();
diff --git a/library/Class/Localisation.php b/library/Class/Localisation.php
index e6ef278ee1ece6f1d67815d466503dd3e4e875e8..7afe7020da660c1e22ad770f5355d5035c8ae756 100644
--- a/library/Class/Localisation.php
+++ b/library/Class/Localisation.php
@@ -232,12 +232,15 @@ class Class_Localisation extends Storm_Model_Abstract {
$quality = count(array_intersect_assoc($matching_datas, $exemplaire_datas));
+ if ($quality < count($matching_datas) && $quality < (count($exemplaire_datas)))
+ return null;
+
if( 0 > ($cote_quality = $this->coteMatchingQuality($exemplaire)))
return null;
$quality += $cote_quality;
- return [$quality => $this];
+ return ($quality > 0) ? [$quality => $this] : null;
}
diff --git a/library/Class/OneDTouchLink.php b/library/Class/OneDTouchLink.php
index 148ddf043a70aa5252c249162451a37127c776b0..589137d2e3aba89ae164f9ba30a4f7d76c16c208 100644
--- a/library/Class/OneDTouchLink.php
+++ b/library/Class/OneDTouchLink.php
@@ -21,28 +21,40 @@
class Class_OneDTouchLink {
+ use Trait_Translator;
+
const BASE_URL = 'http://music.1dtouch.com/';
- public static function urlFor($album) {
- if (Class_AdminVar::isOneDTouchSso())
- return static::ssoUrlFor($album);
+ const NEW_VERSION = 'NEW';
+ const OLD_VERSION = 'OLD';
- return sprintf(static::simpleUrlPattern(), $album->getIdOrigine());
+ public function urlFor($album) {
+ return static::BASE_URL
+ . (Class_AdminVar::isOneDTouchSso() ? $this->ssoUrlFor($album) : $this->simpleUrlFor($album));
}
- public static function ssoUrlFor($album) {
- return sprintf(static::ssoUrlPattern(), Class_AdminVar::get('ONEDTOUCH_ID'), $album->getIdOrigine());
+ protected function simpleUrlFor($album) {
+ return 'albums/' . $album->getIdOrigine();
}
- public static function simpleUrlPattern() {
- return static::BASE_URL . 'albums/%s';
+ protected function ssoUrlFor($album) {
+ return $this->ssoUrl() . $this->simpleUrlFor($album);
+ }
+
+
+ protected function ssoUrl() {
+ $id = Class_AdminVar::get('ONEDTOUCH_ID');
+
+ return (static::NEW_VERSION == Class_AdminVar::get('ONEDTOUCH_VERSION_URL'))
+ ? 'users/auth/afi?bibid=' . $id. '&dest='
+ : 'users/auth/' . $id . '?dest=';
}
- public static function ssoUrlPattern() {
- return static::BASE_URL . 'users/auth/%s?dest=albums/%s';
+ public function getVersionOptions() {
+ return [static::NEW_VERSION => $this->_('Nouvelle version'),
+ static::OLD_VERSION => $this->_('Ancienne version')];
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/Class/PanierNotice.php b/library/Class/PanierNotice.php
index ad54242e17032534c9d879c9de294b096a55ab7e..8171d695f3ab6b9362d134919d630ef6cdbffbcf 100644
--- a/library/Class/PanierNotice.php
+++ b/library/Class/PanierNotice.php
@@ -47,20 +47,26 @@ class PanierNoticeLoader extends Storm_Model_Loader {
}
+ public function findAllIdsWithCatalogue() {
+ $panier_notice_catalogue = Class_PanierNoticeCatalogue::getLoader()->findAll();
+ $ids_with_catalogue = array_map(function($association) {return $association->getIdPanier();}, $panier_notice_catalogue);
+ return array_filter(array_unique($ids_with_catalogue));
+ }
+
+
public function findAllWithCatalogue() {
- $this->user = Class_Users::getIdentity();
+ $ids = $this->findAllIdsWithCatalogue();
+
+ if(empty($ids))
+ return [];
- return array_filter(
- array_unique(
- array_map(
- function($association) {return $association->getPanierNotice();},
- Class_PanierNoticeCatalogue::findAll())));
+ return Class_PanierNotice::findAllBy(['id' => $ids]);
}
public function indexAll() {
Class_NoticeDomain::deleteBy(['panier_id not' => 0]);
- $cart_to_index = Class_PanierNotice::findAllWithCatalogue();
+ $cart_to_index = Class_PanierNotice::getLoader()->findAllWithCatalogue();
foreach($cart_to_index as $cart) {
$cart->index();
}
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 8495ddf1c0d53b7e2361ffa71fdcda4923b10e59..974edf1d140ed2d92af6e35cbed5262b33d746af 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -20,6 +20,8 @@
*/
class ProfilLoader extends Storm_Model_Loader {
+ protected $_root;
+
public function getProfilsByBib($id_zone, $id_bib) {
$profils = Class_Profil::findAllByZoneAndBib($id_zone, $id_bib);
$profils_by_bib = [];
@@ -76,7 +78,9 @@ class ProfilLoader extends Storm_Model_Loader {
}
public function getRoot() {
- return Class_profil::newInstanceWithId(null,[]);
+ return isset($this->_root)
+ ? $this->_root
+ : ($this->_root = Class_profil::newInstanceWithId(null,[]));
}
public function isAPhoneProfilEnabled() {
@@ -917,6 +921,16 @@ class Class_Profil extends Storm_Model_Abstract {
}
+ public function setCfgModulesPreferences($prefs, $controller, $action, $subaction = '') {
+ $prefs = array_merge($this->getCfgModulesPreferences($controller, $action, $subaction),
+ $prefs);
+
+ $cfg_modules = $this->getCfgModulesAsArray();
+ $cfg_modules[$controller][$action.$subaction] = $prefs;
+ $this->setCfgModules($cfg_modules)->save();
+ }
+
+
/**
* @return string la liste des codes a afficher sur la notice dans
* le résultat de recherche (ex: 'TANGE')
diff --git a/library/Class/Systeme/ModulesAppli.php b/library/Class/Systeme/ModulesAppli.php
index 6b69a569e464d9aabe7a56591883d1d45cacc7b1..c895e1c0bcb0b39a1e2df0618c2fb23e90ccf65a 100644
--- a/library/Class/Systeme/ModulesAppli.php
+++ b/library/Class/Systeme/ModulesAppli.php
@@ -67,8 +67,8 @@ class Class_Systeme_ModulesAppli extends Class_Systeme_ModulesAbstract {
'popup_width' => 800,
'popup_height' => 700],
'register' => ['libelle' => 'Demande d\'inscription',
- 'popup_width' => 710,
- 'popup_height' => 290],
+ 'popup_width' => 800,
+ 'popup_height' => 700],
'lostpass' => ['libelle' => 'Mot de passe oublié',
'popup_width' => 710,
'popup_height' => 290]],
@@ -280,35 +280,26 @@ class Class_Systeme_ModulesAppli extends Class_Systeme_ModulesAbstract {
* @return int
*/
private function getDefautAuth($action) {
- $ret = array();
-
- switch ((string)$action) {
- case "login":
- $ret=array_merge(['barre_nav'=>'Connexion'],
+ if ('login' == $action)
+ return array_merge(['barre_nav' => 'Connexion'],
(new Class_Systeme_ModulesAccueil_Login())->getDefaultValues());
- break;
- case "register":
- $ret["barre_nav"] = "S'inscrire"; // Barre de nav
- $ret["titre"] = "Demande d'inscription"; // Titre de la boite
- $ret["register_help"] = "Remplissez les champs ci-dessous\n"
- ."Un mail de confirmation vous sera envoyé.\n"
- ."Vous devrez cliquer sur le lien pour confirmer la création de votre compte."; // Texte d'aide
- $ret["register_confirm"] = "Cher Internaute,<br />"
- ."Merci pour votre inscription.<br />"
- ."Pour vérifier l'adresse e-mail associée à votre compte, nous avons envoyé un courrier "
- ."électronique à l'adresse indiquée. Pour activer votre compte, accédez à votre messagerie "
- ."et cliquez sur le lien fourni dans le courrier de vérification.";
- break;
- case "lostpass":
- $ret["barre_nav"] = "demande de mot de passe"; // Barre de nav
- $ret["titre"] = "Mot de passe oublié"; // Titre de la boite
- break;
- }
- return $ret;
+ if ('register' == $action)
+ return ['barre_nav' => 'S\'inscrire',
+ 'titre' => 'Demande d\'inscription',
+ 'register_help' => "Remplissez les champs ci-dessous\nUn mail de confirmation vous sera envoyé.\nVous devrez cliquer sur le lien pour confirmer la création de votre compte.",
+ 'register_confirm' => "Cher Internaute,<br />Merci pour votre inscription.<br />Pour vérifier l'adresse e-mail associée à votre compte, nous avons envoyé un courrier électronique à l'adresse indiquée. Pour activer votre compte, accédez à votre messagerie et cliquez sur le lien fourni dans le courrier de vérification.",
+ 'fields' => 'library:;card_number:', // nom_de_champs:[|optional|required]
+ ];
+ if ('lostpass' == $action)
+ return ['barre_nav' => 'demande de mot de passe',
+ 'titre' => 'Mot de passe oublié'];
+
+ return [];
}
+
/**
* @param type string
* @return array
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 529c5abd8b8d0095f3fcb9bdbbc0a79944629d78..c930b6428e17b7cd1d56724540e3331155c4ae04 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -994,13 +994,19 @@ class Class_Users extends Storm_Model_Abstract {
return $ret;
}
- Class_UsersNonValid::newInstance(['login' => $login,
- 'password' => $mdp,
- 'mail' => $mail,
- 'cle' => $cle])->save();
+ $attribs = ['login' => $login,
+ 'password' => $mdp,
+ 'mail' => $mail,
+ 'cle' => $cle];
- $profil = Class_Profil::getCurrentProfil();
+ if (array_key_exists('id_site', $data))
+ $attribs['id_site'] = $data['id_site'];
+ if (array_key_exists('idabon', $data))
+ $attribs['idabon'] = $data['idabon'];
+
+ Class_UsersNonValid::newInstance($attribs)->save();
+ $profil = Class_Profil::getCurrentProfil();
// Corps du mail
$message_mail=[];
@@ -1455,23 +1461,18 @@ class Class_Users extends Storm_Model_Abstract {
}
- public function getEditablePaniers() {
- $user_paniers = $this->getPaniers();
- if ($this->canAccessBackend())
- $user_paniers = array_filter(array_unique(array_merge($user_paniers,
- Class_PanierNotice::findAllWithCatalogue())));
- Class_PanierNotice::sortPaniersByLibelle($user_paniers);
- return $user_paniers;
- }
-
-
public function canModifyPanier($panier) {
if (!$panier || $panier->isNew())
return true;
- $ids_paniers = array_map(function($panier) {return $panier->getId();},
- $this->getEditablePaniers());
- return in_array($panier->getId(), $ids_paniers);
+ $user_paniers_ids = (new Storm_Model_Collection($this->getPaniers()))->collect('id');
+ if (in_array($panier->getId(), $user_paniers_ids->getArrayCopy()))
+ return true;
+
+ if (!$this->canAccessBackend())
+ return false;
+
+ return in_array($panier->getId(), Class_PanierNotice::findAllIdsWithCatalogue());
}
diff --git a/library/Class/UsersNonValid.php b/library/Class/UsersNonValid.php
index ba7185946f2b2da85b7f195b0aa9d6d5dec8cea3..3999c10ac669db2f3e1ffd5743da2ebe9b5c6885 100644
--- a/library/Class/UsersNonValid.php
+++ b/library/Class/UsersNonValid.php
@@ -67,12 +67,16 @@ class Class_UsersNonValid extends Storm_Model_Abstract {
protected $_user;
+ protected $_default_attribute_values = ['id_site' => 0, 'idabon' => ''];
+
public function activate() {
$user = new Class_Users();
if (!$user
->setLogin($this->getLogin())
->setMail($this->getMail())
->setPassword($this->getPassword())
+ ->setIdSite($this->getIdSite())
+ ->setIdabon($this->getIdabon())
->save())
return false;
diff --git a/library/Trait/TreeNode.php b/library/Trait/TreeNode.php
index 14dff96df30b738fa4513398426cf6ab8bb3b16f..ffffbb4566404c9a074b6f1fa1f928e6eff6bab7 100644
--- a/library/Trait/TreeNode.php
+++ b/library/Trait/TreeNode.php
@@ -22,6 +22,8 @@
trait Trait_TreeNode {
public static $PATH_SEPARATOR = '/';
+ protected $_path_cache = [];
+
public function getPath() {
return static::$PATH_SEPARATOR.implode(static::$PATH_SEPARATOR, $this->getPathParts());
}
@@ -38,6 +40,14 @@ trait Trait_TreeNode {
* @param $path string: le chemin pour retrouver un enfant dans la hiérarchie. Ex: /Histoire/Politique/XXe
*/
public function findByPath($path) {
+ if (array_key_exists($path, $this->_path_cache))
+ return $this->_path_cache[$path];
+
+ return $this->_path_cache[$path] = $this->_computeFindByPath($path);
+ }
+
+
+ protected function _computeFindByPath($path) {
if (!$parts = array_filter(explode(static::$PATH_SEPARATOR, $path)))
return $this;
diff --git a/library/ZendAfi/Form/Admin/EditAvis.php b/library/ZendAfi/Form/Admin/EditAvis.php
index c11db2b589e063d4756d7d717915f7d04a4527fd..c7556b835ac62190d5d6bcabf1db6133f5cce4e2 100644
--- a/library/ZendAfi/Form/Admin/EditAvis.php
+++ b/library/ZendAfi/Form/Admin/EditAvis.php
@@ -41,7 +41,8 @@ class ZendAfi_Form_Admin_EditAvis extends ZendAfi_Form {
$this->setAttrib('data-backurl',
$this->getView()->url(['module' => 'admin',
'controller' => 'modo',
- 'action' => $action], null, true));
+ 'action' => $action,
+ 'id' => null]));
return $this;
}
diff --git a/library/ZendAfi/Form/Configuration/AuthRegister.php b/library/ZendAfi/Form/Configuration/AuthRegister.php
new file mode 100644
index 0000000000000000000000000000000000000000..6b8c1771fbfc8d953def5c3fe06100fe7d449499
--- /dev/null
+++ b/library/ZendAfi/Form/Configuration/AuthRegister.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_Form_Configuration_AuthRegister extends ZendAfi_Form {
+
+ public static function newConfigurationWith($conf) {
+ $form = new static();
+ $form->populate($conf);
+ return $form;
+ }
+
+
+ public function init() {
+ parent::init();
+
+ $this
+ ->setAttrib('id', 'auth_register_conf')
+
+ ->addElement('select', 'boite',
+ ['label' => $this->_('Style de boite'),
+ 'multiOptions' => (new Class_Profil_Templates(Class_Profil::getCurrentProfil()))->toArray()])
+
+ ->addElement('text', 'barre_nav', ['label' => $this->_('Texte du fil d\'ariane'),
+ 'size' => 25,
+ 'maxlength' => 30])
+
+ ->addDisplayGroup(['boite', 'barre_nav'], 'common', ['legend' => $this->_('Module')])
+
+ ->addElement('text', 'titre', ['label' => $this->_('Titre'),
+ 'size' => 40])
+
+ ->addElement('textarea', 'register_help', ['label' => $this->_('Texte d\'aide'),
+ 'cols' => 70,
+ 'rows' => 5])
+
+ ->addElement('textarea', 'register_confirm', ['label' => $this->_('Texte de confirmation'),
+ 'cols' => 70,
+ 'rows' => 5])
+
+ ->addDisplayGroup(['titre', 'register_help', 'register_confirm'],
+ 'prefs',
+ ['legend' => $this->_('Préférences')])
+
+ ->addElement('select', 'library',
+ ['label' => $this->_('Bibliothèque d\'inscription'),
+ 'multiOptions' => $this->_optionalFieldOptions()])
+
+ ->addElement('select', 'card_number',
+ ['label' => $this->_('N° de carte'),
+ 'multiOptions' => $this->_optionalFieldOptions()])
+
+ ->addDisplayGroup(['library', 'card_number'], 'options', ['legend' => $this->_('Champs optionnels')])
+
+ ->addElement('submit', 'submit', ['label' => $this->_('Valider'),
+ 'class' => 'bouton'])
+
+ ->addDisplayGroup(['submit'], 'submit', ['legend' => ''])
+ ;
+ }
+
+
+ public function populate(array $datas) {
+ parent::populate($datas);
+ if (!array_key_exists('fields', $datas))
+ return $this;
+
+ foreach(explode(';', $datas['fields']) as $field) {
+ $parts = explode(':', $field);
+ if ($element = $this->getElement($parts[0]))
+ $element->setValue($parts[1]);
+ }
+
+ return $this;
+ }
+
+
+ protected function _optionalFieldOptions() {
+ return ['' => $this->_('Non affiché'),
+ 'optional' => $this->_('Affiché et facultatif'),
+ 'required' => $this->_('Affiché et obligatoire')];
+ }
+
+
+ public function getValues() {
+ $values = parent::getValues();
+ $values['fields'] = 'library:' . $values['library'] . ';card_number:' . $values['card_number'];
+ unset($values['library'], $values['card_number']);
+
+ return $values;
+ }
+}
\ No newline at end of file
diff --git a/library/ZendAfi/Form/Configuration/SearchResult.php b/library/ZendAfi/Form/Configuration/SearchResult.php
index 5a7839015e2193c074a403a54a1944df788b9c0d..df54207a61408ee52d1a1800d6f657c3b13d8b5b 100644
--- a/library/ZendAfi/Form/Configuration/SearchResult.php
+++ b/library/ZendAfi/Form/Configuration/SearchResult.php
@@ -240,7 +240,8 @@ class ZendAfi_Form_Configuration_SearchResult extends ZendAfi_Form {
->addElement('submit',
'submit',
- ['label' => $this->_('Valider')]);
+ ['label' => $this->_('Valider'),
+ 'class' => 'bouton']);
}
diff --git a/library/ZendAfi/Form/Register.php b/library/ZendAfi/Form/Register.php
new file mode 100644
index 0000000000000000000000000000000000000000..a731b7a270e0e86e75cd65594c707b5302956860
--- /dev/null
+++ b/library/ZendAfi/Form/Register.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_Form_Register extends ZendAfi_Form {
+ public function init() {
+ parent::init();
+
+ $this->_initCommons()
+ ->_initOptionals()
+ ->_initCaptcha();
+
+ $this->addElement('submit','submit', ['label' => $this->_('Valider')]);
+ }
+
+
+ protected function _initCommons() {
+ $this
+ ->addElement('text', 'login', ['label' => $this->_('Identifiant'),
+ 'maxlength' => 20,
+ 'required' => true,
+ 'allowEmpty' => false,
+ 'validators' => ['LoginExists']])
+
+ ->addElement('password', 'mdp', ['label' => $this->_('Mot de passe'),
+ 'maxlength' => 15,
+ 'required' => true,
+ 'allowEmpty' => false,])
+
+ ->addElement('password', 'mdp2', ['label' => $this->_('Confirmez votre mot de passe'),
+ 'maxlength' => 15,
+ 'required' => true,
+ 'allowEmpty' => false,
+ 'validators' => [new ZendAfi_Validate_PasswordEquals('mdp')]])
+
+ ->addElement('email', 'mail', ['label' => $this->_('E-mail'),
+ 'maxlength' => 50,
+ 'required' => true,
+ 'allowEmpty' => false,
+ 'validators' => ['MailExists']])
+
+ ->addElement('email', 'mail2', ['label' => $this->_('Confirmez votre e-mail'),
+ 'maxlength' => 50,
+ 'required' => true,
+ 'allowEmpty' => false,
+ 'validators' => [new ZendAfi_Validate_MailEquals('mail')]])
+
+ ->addDisplayGroup(['login', 'mdp', 'mdp2', 'mail', 'mail2'],
+ 'fields',
+ ['legend' => '']);
+
+ return $this;
+ }
+
+
+ protected function _initOptionals() {
+ (new ZendAfi_Form_RegisterOptionals())->addTo($this);
+ return $this;
+ }
+
+
+ protected function _initCaptcha() {
+ $this->addElement('captcha', 'captcha',
+ ['captcha' => 'Image',
+ 'label' => $this->_('Recopiez le code'),
+ 'captchaOptions' => ['font' => PATH_FONTS.'/Vera.ttf',
+ 'imgDir' => PATH_CAPTCHA,
+ 'imgUrl' => URL_CAPTCHA]])
+
+ ->addDisplayGroup(['captcha'], 'security', ['legend' => $this->_('Sécurité')]);
+ return $this;
+ }
+}
+
+
+class ZendAfi_Form_RegisterOptionals {
+ protected
+ $_form,
+ $_added = [];
+
+ public function addTo($form) {
+ if (!$pref = Class_Profil::getCurrentProfil()->getModulePreference('auth', 'register', 'fields'))
+ return;
+
+ $this->_form = $form;
+
+ foreach(explode(';', $pref) as $field)
+ ZendAfi_Form_RegisterOptional::newWith($field)->addTo($this);
+
+ if ($this->_added)
+ $form->addDisplayGroup($this->_added, 'optionals', ['legend' => '']);
+ }
+
+
+ public function addElement($type, $id, $options) {
+ $this->_added[] = $id;
+ return $this->_form->addElement($type, $id, $options);
+ }
+}
+
+
+
+class ZendAfi_Form_RegisterOptional {
+ use Trait_Translator;
+
+ protected
+ $_type,
+ $_id,
+ $_visibility = '';
+
+ public static function newWith($field) {
+ if ((!$parts = explode(':', $field))
+ || 2 > count($parts)
+ || '' == $parts[1])
+ return new static();
+
+ $class_name = 'ZendAfi_Form_RegisterOptional'.ucfirst($parts[0]);
+ return new $class_name($parts[1]);
+ }
+
+
+ public function __construct($visibility='') {
+ $this->_visibility = $visibility;
+ }
+
+
+ public function addTo($parent) {
+ if ('' == $this->_visibility)
+ return;
+
+ $parent->addElement($this->_type, $this->_id, $this->_getOptions());
+ }
+
+
+ protected function _getOptions() {
+ $options = ['label' => $this->_getLabel()];
+ if ('required' == $this->_visibility) {
+ $options['required'] = true;
+ $options['allowEmpty'] = false;
+ }
+
+ return $options;
+ }
+
+
+ protected function _getLabel() {
+ return '';
+ }
+}
+
+
+
+class ZendAfi_Form_RegisterOptionalLibrary extends ZendAfi_Form_RegisterOptional {
+ protected
+ $_type = 'select',
+ $_id = 'id_site';
+
+ protected function _getLabel() {
+ return $this->_('Bibliothèque de rattachement');
+ }
+
+
+ protected function _getOptions() {
+ $options = parent::_getOptions();
+ $options['multiOptions'] = Class_Bib::findAllLabels();
+ return $options;
+ }
+}
+
+
+
+class ZendAfi_Form_RegisterOptionalCard_number extends ZendAfi_Form_RegisterOptional {
+ protected
+ $_type = 'text',
+ $_id = 'idabon';
+
+ protected function _getLabel() {
+ return $this->_('N° de carte');
+ }
+}
diff --git a/library/ZendAfi/View/Helper/Article/RenderAbstract.php b/library/ZendAfi/View/Helper/Article/RenderAbstract.php
index 72db49674a06d6fd35819b8ce4379610046cacf4..cc1567ef9105c1f82aace52566c4eda6ab776d7a 100644
--- a/library/ZendAfi/View/Helper/Article/RenderAbstract.php
+++ b/library/ZendAfi/View/Helper/Article/RenderAbstract.php
@@ -112,14 +112,7 @@ abstract class ZendAfi_View_Helper_Article_RenderAbstract extends ZendAfi_View_H
public function renderReseauxSociaux($article) {
- $url_reseau = $this->view->url(['controller' => 'cms',
- 'action' => 'reseau',
- 'id_article' => $article->getId()], null, true);
-
- return
- '<div class="reseaux-sociaux" data-article-url="'.$url_reseau.'">'
- .$this->view->tagImg(URL_IMG . 'patience.gif')
- .'</div>';
+ return $this->view->reseauxSociaux($article);
}
diff --git a/library/ZendAfi/View/Helper/Avis.php b/library/ZendAfi/View/Helper/Avis.php
index e13c8854fdf018a2ef04e5025d1e5d3cb8452ddf..048fcb0a6b0adf940601d84c11bb6b301eb4f854 100644
--- a/library/ZendAfi/View/Helper/Avis.php
+++ b/library/ZendAfi/View/Helper/Avis.php
@@ -25,6 +25,8 @@ class ZendAfi_View_Helper_Avis extends ZendAfi_View_Helper_BaseHelper {
protected $_actions = [];
protected $_admin_actions = [];
protected $_url_context = [];
+ protected $_active_tab = 0;
+ protected $_page = 0;
public function setVignetteLinkToAvis() {
$this->_vignette_link_to_avis = true;
@@ -43,6 +45,16 @@ class ZendAfi_View_Helper_Avis extends ZendAfi_View_Helper_BaseHelper {
}
+ public function setActiveTab($active_tab) {
+ $this->_active_tab = $active_tab;
+ }
+
+
+ public function setPage($page) {
+ $this->_page = $page;
+ }
+
+
public function setAdminActions($actions) {
$this->_admin_actions = $actions;
return $this;
@@ -220,8 +232,11 @@ class ZendAfi_View_Helper_Avis extends ZendAfi_View_Helper_BaseHelper {
$suffix = ($avis->isAvisNotice()) ? 'avisnotice' : '-aviscms';
foreach($this->_actions as $action) {
$link = $this->view->tagAnchor($this->_url(['action' => $action . $suffix,
- 'id' => $avis->getId()]),
+ 'id' => $avis->getId(),
+ 'active_tab' => $this->_active_tab,
+ 'page' => $this->_page]),
$this->view->boutonIco('type=' . $action));
+
$html_actions .= $this->_tag('span', $link, ['rel' => $action]);
}
@@ -237,11 +252,12 @@ class ZendAfi_View_Helper_Avis extends ZendAfi_View_Helper_BaseHelper {
protected function _getAdminActionsTag($avis) {
$html_actions = '';
-
foreach($this->_admin_actions as $action) {
$link = $this->view->tagAnchor($this->_url(['controller' => 'abonne',
'action' => $action . 'avisnotice',
- 'id' => $avis->getId()]),
+ 'id' => $avis->getId(),
+ 'active_tab' => $this->_active_tab,
+ 'page' => $this->_page]),
$this->view->boutonIco('type=' .$action),
['data-popup' => 'true']);
$html_actions .= $this->_tag('span', $link, ['rel' => $action]);
diff --git a/library/ZendAfi/View/Helper/AvisBloc.php b/library/ZendAfi/View/Helper/AvisBloc.php
index 22ee7bf9ff49dbd6145d58f54fb9bf49b4b0665a..19361663327d357364ef23af531e600d117555c4 100644
--- a/library/ZendAfi/View/Helper/AvisBloc.php
+++ b/library/ZendAfi/View/Helper/AvisBloc.php
@@ -43,13 +43,33 @@ class ZendAfi_View_Helper_AvisBloc extends Zend_View_Helper_HtmlElement {
protected function renderBlock() {
if(!count($this->_list))
return $this->view->tag('p',
- $this->view->_('Aucun avis %s à modérer.', ($this->_label ? $this->_label : '')),
+ $this->view->_('Aucun avis %s à modérer.',
+ ($this->_label ? $this->_label : '')),
['class' => 'error']);
- return $this->injectPager($this->view->partialCycle('modo/_avis_partial.phtml',
- 'avis',
- $this->_list,
- ['first', 'second']));
+ $html = '';
+ foreach ($this->_list as $avis)
+ $html .= $this->_renderAvis($avis);
+
+ return $this->injectPager($html);
+ }
+
+
+ protected function _renderAvis($avis) {
+ $actions = ['validate', 'edit', 'del'];
+ if ($avis->getFlags() >= 0)
+ $actions[] = ($avis->getFlags() == 0) ? 'invisible' : 'visible';
+
+ $helper = $this->view->getHelper('avis');
+
+ $helper->setActions($actions);
+ $helper->setActiveTab($this->_index);
+ $helper->setPage($this->_page);
+
+ $html = $this->view->avis($avis) .
+ $this->view->tag('div', '', ['class' => 'clear']);
+
+ return $this->view->tag('div', $html);
}
diff --git a/library/ZendAfi/View/Helper/FonctionsAdmin.php b/library/ZendAfi/View/Helper/FonctionsAdmin.php
index f15ad7a8e377ca7848684fa4e28675f6ad89944d..e8c9cc77e7639016becf0d70adab634e3a75aab7 100644
--- a/library/ZendAfi/View/Helper/FonctionsAdmin.php
+++ b/library/ZendAfi/View/Helper/FonctionsAdmin.php
@@ -112,9 +112,9 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
return $this->_tag('a',
$this->view->tagImg(URL_ADMIN_IMG . 'ico/del.gif',
- ['onclick' => $onclick,
- 'alt' => $label,
+ ['alt' => $label,
'title' => $label]),
- ['href' => $url]);
+ ['href' => $url,
+ 'onclick' => $onclick]);
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Notice/FacettesTypeDoc.php b/library/ZendAfi/View/Helper/Notice/FacettesTypeDoc.php
index fa3580a29fa3c3caa170a7d477c9d8fccef78726..90207bbe38d84425571bb16e9ccc4aa372817ac8 100644
--- a/library/ZendAfi/View/Helper/Notice/FacettesTypeDoc.php
+++ b/library/ZendAfi/View/Helper/Notice/FacettesTypeDoc.php
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class ZendAfi_View_Helper_Notice_FacettesTypeDoc extends Zend_View_Helper_HtmlElement {
public function notice_FacettesTypeDoc($facettes) {
@@ -26,10 +26,10 @@ class ZendAfi_View_Helper_Notice_FacettesTypeDoc extends Zend_View_Helper_HtmlEl
if (!isset($facettes['T']))
$facettes['T'] = [];
- foreach($facettes['T'] as $facette) {
- if (!is_array($facette))
- continue;
- $html .= $this->renderFacette($facette['id'], $facette['libelle'], $facette['nombre']);
+ foreach($facettes['T'] as $code => $value) {
+ $label = Class_Codification::getInstance()->getLibelleFacette($code);
+
+ $html .= $this->renderFacette($code, $label, $value);
}
return $html.'</div>';
@@ -37,7 +37,7 @@ class ZendAfi_View_Helper_Notice_FacettesTypeDoc extends Zend_View_Helper_HtmlEl
public function renderFacette($id, $libelle, $nombre) {
- return $this->view->tagAnchor(['facette' => $id], $nombre,
+ return $this->view->tagAnchor(['facette' => $id], $nombre,
['class' => 'type_doc_'.substr($id, 1 ),
'libelle' => $libelle]);
}
diff --git a/library/ZendAfi/View/Helper/Permalink.php b/library/ZendAfi/View/Helper/Permalink.php
index 79d18c48eec6834805e0e3288443e4bad3f25bbd..27d93130b2f407e01323eddb7f80a04e77c79ff8 100644
--- a/library/ZendAfi/View/Helper/Permalink.php
+++ b/library/ZendAfi/View/Helper/Permalink.php
@@ -26,22 +26,15 @@ class ZendAfi_View_Helper_Permalink extends ZendAfi_View_Helper_BaseHelper {
? $profil->getUrlImage($icon)
: URL_ADMIN_IMG . 'reseaux/permalink.gif';
- $lien_permanent = $this->translate()->_('Lien permanent');
- $html = $this->view->tagImgHover($icon_url,
- ['class' => 'permalien-img',
- 'title' => $lien_permanent,
- 'alt' => $lien_permanent,
- 'onclick' => '$(this).next().children().first().toggle()']);
+ $lien_permanent = $this->view->_('Lien permanent');
- $html .= '<div><div style="display:none; z-index: 101;">';
- $html .= '<div>' . $lien_permanent . '</div>';
- $html .= '<div>' .
- '<a href="#" onclick="$(this).parent().parent().hide(); return false">» ' . $this->translate()->_('fermer cette fenêtre') . '</a>'.
- '</div>';
- $html .= $this->view->tag('span', $url, ['class' => 'permalink-url']);
- $html .='</div></div>';
-
- return $html;
+ return $this->view->tagImgHover($icon_url,
+ ['class' => 'permalink permalien-img', //permalien-img kept for previous skins compatibility
+ 'alt' => $lien_permanent,
+ 'title' => $lien_permanent,
+ 'data-url' => $url,
+ 'data-helptext' => $this->view->_('Copiez le lien suivant'),
+ 'onclick' => 'popupPermalink(this)']);
}
}
diff --git a/library/ZendAfi/View/Helper/PremierChapitre/Lien.php b/library/ZendAfi/View/Helper/PremierChapitre/Lien.php
index 803893bdf4b63d14a73586ccc284f71d79ade1aa..8ad3e9c213c32eaa8e6e24617d316d5ecd8daa1d 100644
--- a/library/ZendAfi/View/Helper/PremierChapitre/Lien.php
+++ b/library/ZendAfi/View/Helper/PremierChapitre/Lien.php
@@ -39,7 +39,9 @@ class ZendAfi_View_Helper_PremierChapitre_Lien
protected function _getHref($model, $preferences) {
if ($this->_isLinkToRecord($preferences))
- return '/premier-chapitre/notice/ean/' . $model->getId();
+ return Class_Url::absolute(['controller' => 'premier-chapitre',
+ 'action' => 'notice',
+ 'ean' => $model->getId()]);
return ($this->_isLinkToTarget($preferences))
? '#pc_ancre' : $model->getUrl();
diff --git a/library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php b/library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php
index 9f83521639ef9cd61e03345b084a27a4ae2137f3..258106d1cd366b2e3ef89ae2b1087e85537de4c5 100644
--- a/library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php
+++ b/library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php
@@ -72,8 +72,12 @@ class ZendAfi_View_Helper_PremierChapitre_Vignettes
protected function _vignetteFrame($model, $preferences){
$onclick = "\$('#pc_frame')[0].src='".$model->getUrl()."';";
- if ($this->_isLinkToRecord($preferences))
- $onclick .= "\$('#pc_lienNotice')[0].href='/premier-chapitre/notice/ean/" . $model->getId()."';";
+ if ($this->_isLinkToRecord($preferences)) {
+ $url = $this->view->url(['controller'=>'premier-chapitre',
+ 'action' => 'notice',
+ 'ean' => $model->getId()], null ,true);
+ $onclick .= sprintf("\$('#pc_lienNotice')[0].href='%s';", $url);
+ }
return $this->_tag('a', $this->_vignetteImg($model),
['onclick' => $onclick,
@@ -87,10 +91,12 @@ class ZendAfi_View_Helper_PremierChapitre_Vignettes
protected function _vignetteNotice($model, $preferences){
- $lnk_attribs = ['href' => '/premier-chapitre/notice/ean/' . $model->getId()];
+ $lnk_attribs = $this->view->url(['controller' => 'premier-chapitre',
+ 'action' => 'notice',
+ 'ean' => $model->getId()], null, true);
return $this->_tag('a', $this->_vignetteImg($model),
- $lnk_attribs);
+ ['href' => $lnk_attribs]);
}
diff --git a/library/ZendAfi/View/Helper/ReseauxSociaux.php b/library/ZendAfi/View/Helper/ReseauxSociaux.php
index 2bf203965e0b890a2f396e8902646e3886663307..a542741447002e62506d537c7c059667fc1a4098 100644
--- a/library/ZendAfi/View/Helper/ReseauxSociaux.php
+++ b/library/ZendAfi/View/Helper/ReseauxSociaux.php
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper {
@@ -32,16 +32,14 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
if (!$article_or_notice_or_profil)
return '';
-
+
return $article_or_notice_or_profil->renderOn($this);
}
public function renderArticle($article) {
- $id_profil = Class_Profil::getCurrentProfil()->getId();
-
- return $this->links(['url_to_share'=>$this->view->url($article->getUrl()).'?id_profil='.$id_profil,
+ return $this->links(['url_to_share'=>$this->view->url($article->getUrl()).'?id_profil=' . Class_Profil::getCurrentProfil()->getId(),
'titre' => $article->getTitre(),
'message' => 'article',
'img_url' => $article->getFirstImageURL()]);
@@ -50,14 +48,14 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function renderNotice($notice) {
$id_profil = Class_Profil::getCurrentProfil()->getId();
-
+
return $this->links(['url_to_share'=>$this->view->urlNotice($notice).'?id_profil='.$id_profil,
'titre' => $notice->getTitreEtSousTitre().' - '.$notice->getAuteurPrincipal(),
'message' => $notice->getResume(),
'img_url' => $notice->getUrlVignette()]);
}
-
+
public function renderProfil($profil) {
return $this->headerLinks(['url_to_share'=>Zend_Controller_Front::getInstance()->getBaseUrl(),
'titre' => $profil->getTitreSite(),
@@ -67,14 +65,14 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function links($info_to_share) {
- $html='<div class="vignette-reseaux-sociaux">';
- $html.= $this->shareLinkHtml($info_to_share);
+ $html='<div class="vignette-reseaux-sociaux reseaux-sociaux">';
+ $html.= $this->shareLinkHtmlHeader($info_to_share);
$html.= $this->view->permalink($this->view->absoluteUrl($info_to_share['url_to_share']));
$html.='</div>';
return $html;
}
-
+
public function headerLinks($info_to_share){
$html= '<div class="share">';
$html.= $this->shareLinkHtmlHeader($info_to_share);
@@ -83,11 +81,11 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
return $html.= '</div>';
}
-
+
public function shareLinkHtml($info) {
$html = '';
foreach($this->reseaux as $clef => $reseau) {
- $html.= $this->shareLinkImgHtml($clef,
+ $html.= $this->shareLinkImgHtml($clef,
array_merge($this->shareLinkUrlTable($clef,$info),
$this->getShareIco($clef)));
}
@@ -119,7 +117,7 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
return $html.='<script type="text/javascript">$(function(){initializeImgHover()});</script>';
}
-
+
public function shareLinkUrlTable($clef,$info){
return ['on' => $clef,
'url' => urlencode($info['url_to_share']),
@@ -133,8 +131,8 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function getScriptFromController($url_table){
return $this->view->url(['controller' => 'social-network',
'action' => 'share',
- 'on' =>$url_table['on'],
- 'url' => $url_table['url'],
+ 'on' =>$url_table['on'],
+ 'url' => $url_table['url'],
'titre' => $url_table['titre'],
'message'=> $url_table['message'],
'img_url' => $url_table['img_url']]);
diff --git a/library/ZendAfi/View/Helper/ShareUrl.php b/library/ZendAfi/View/Helper/ShareUrl.php
index a26b638a81213b7f0a469a43dd538cc2ca3ce3dc..2f08b61f2d2cd1eddb634df48fe61fd079d1bbcd 100644
--- a/library/ZendAfi/View/Helper/ShareUrl.php
+++ b/library/ZendAfi/View/Helper/ShareUrl.php
@@ -24,11 +24,7 @@ class ZendAfi_View_Helper_ShareUrl extends Zend_View_Helper_HtmlElement {
protected $reseaux=["facebook" => ["url" => "https://www.facebook.com/sharer/sharer.php"],
"twitter" => ["url" => "http://twitter.com/share?"]];
- protected $url_shortener="http://is.gd/api.php?longurl="; // Url pour obtenir une une url courte
- //------------------------------------------------------------------------------------------------------
- // Rend la structure
- //------------------------------------------------------------------------------------------------------
public function getReseaux($id_reseau=false) {
if($id_reseau)
return $this->reseaux[$id_reseau];
@@ -37,9 +33,7 @@ class ZendAfi_View_Helper_ShareUrl extends Zend_View_Helper_HtmlElement {
}
- //------------------------------------------------------------------------------------------------------
- // Rend l'url a passer en parametre
- //------------------------------------------------------------------------------------------------------
+
public function shareUrl($id_reseau,$url_afi,$titre= '', $message = '', $url_img = '') {
$url_afi = $this->view->absoluteUrl(urldecode($url_afi));
@@ -49,37 +43,13 @@ class ZendAfi_View_Helper_ShareUrl extends Zend_View_Helper_HtmlElement {
if($id_reseau==='twitter')
return $this->reseaux[$id_reseau]["url"].
- $this->getTwitterUrl($this->shortenUrl($url_afi),
+ $this->getTwitterUrl($url_afi,
$titre,
$message);
}
- public function shortenUrl($original_url) {
- $short_url = self::getDefaultWebClient()->open_url($this->url_shortener.urlencode($original_url));
- if (!$short_url or substr($short_url,0,5)=="Error")
- return $original_url;
- return $short_url;
- }
-
-
- static public function getDefaultWebClient() {
- if (!isset(self::$_web_client))
- self::$_web_client = new Class_WebService_SimpleWebClient();
- return self::$_web_client;
- }
-
-
- static public function setDefaultWebClient($web_client) {
- self::$_web_client = $web_client;
- }
-
- static public function resetDefaultWebClient() {
- self::$_web_client = null;
- }
-
public function getTwitterUrl($url_afi, $titre, $message) {
-
return http_build_query(['url' => $url_afi,
'text' => $titre,
'counturl' => $url_afi],
diff --git a/library/ZendAfi/View/Helper/TagOneDTouch.php b/library/ZendAfi/View/Helper/TagOneDTouch.php
index 195ee426e26e22d8d3960baa660e60b5e36e7858..32f4b55383bb6bc7898d5d6008cdda314ca8cf58 100644
--- a/library/ZendAfi/View/Helper/TagOneDTouch.php
+++ b/library/ZendAfi/View/Helper/TagOneDTouch.php
@@ -24,7 +24,7 @@ class ZendAfi_View_Helper_TagOneDTouch extends ZendAfi_View_Helper_BaseHelper {
public function tagOneDTouch($album) {
return $this->_tag('a',
$this->_('Écouter l\'album sur 1DTouch'),
- ['href' => Class_OneDTouchLink::urlFor($album)]);
+ ['href' => (new Class_OneDTouchLink())->urlFor($album)]);
}
}
?>
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index 0065eef016f878a6341d4fe88516bf12710cf87b..5431edf3b5f426ff3acde10477edc0fdcd6dfee5 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -64,7 +64,7 @@ function defineConstant($name, $value) {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.4');
- defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.6');
+ defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.11');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
@@ -110,8 +110,8 @@ function setupConstants() {
defineConstant('PATH_ADMIN_SUPPORTS', ROOT_PATH . 'public/admin/images/supports/');
defineConstant('PATH_FONTS', ROOT_PATH . 'public/opac/fonts/');
- defineConstant('URL_CAPTCHA', BASE_URL . '/public/captcha/');
- defineConstant('PATH_CAPTCHA', ROOT_PATH . 'public/captcha/');
+ defineConstant('URL_CAPTCHA', BASE_URL . '/temp/');
+ defineConstant('PATH_CAPTCHA', PATH_TEMP);
defineConstant('CACHE_LIFETIME', 3600);
defineConstant('MEMCACHED_ENABLE', false);
defineConstant('MEMCACHED_HOST', 'localhost');
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index 4637978cc0e3d562e587e36d725e8544beda91d5..41a04fb58a15344e2580d200a6d15b57deffaea8 100644
--- a/public/admin/js/onload_utils.js
+++ b/public/admin/js/onload_utils.js
@@ -77,9 +77,9 @@ var autoHideShowConfigurationModule = function() {
autoHideShowTagOnParentHover('.select_kiosque_form', 'div.boite');
autoHideShowTagOnParentHover('.edit_menu', '#menu_horizontal');
autoHideShowTagOnParentHover('.newsadd', 'div.boite');
-
}
+
var autoHideShowTagOnParentHover = function (child_selector, parent_selector) {
hide_selector = parent_selector + ' ' + child_selector;
$(hide_selector).hide();
@@ -114,12 +114,11 @@ var initializeImgHover = function() {
}
-
-var initializeReseauxSociaux = function() {
- $('.reseaux-sociaux[data-article-url]').each(
- function(index,element) {
- $element = $(element);
- $element.load($element.attr('data-article-url'));
- }
- );
+var popupPermalink = function(link) {
+ var link = $(link);
+ $("<div title='" + link.attr("title") + "'>"
+ + "<p>" + link.attr("data-helptext") + "</p>"
+ + "<input type='url' style='width:100%' value='" + link.attr("data-url") + "' readonly>"
+ + "</div>"
+ ).dialog({width:500, height:150});
}
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index d7b0cbc4333f6a2dc28afc07ef0f4ceccc1eba3c..98029b565c7df342bc06f815b835a2c75ad77619 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -103,6 +103,10 @@ form.login fieldset {
display:none;
}
+.vignette-reseaux-sociaux img {
+ width: 16px;
+}
+
#boite_login input#login {
display: none;
}
@@ -2285,7 +2289,6 @@ button.vodeclic_link + img {
float:left;
}
-.permalink-url,
.embed-code-to-copy {
margin:5px;
border:1px solid #C8C8C8;
diff --git a/public/opac/js/calendrier.js b/public/opac/js/calendrier.js
index 1fd15d79981734fc4456b2c9ea92bc9487684c21..9da8ae5fcc9472ca8f8b032854b1bb6c6b6148bb 100644
--- a/public/opac/js/calendrier.js
+++ b/public/opac/js/calendrier.js
@@ -48,7 +48,6 @@ var ajaxify_calendars = function () {
if (typeof jQuery != "undefined") {
$(document).ready(resize_func);
- $(document).ready(initializeReseauxSociaux());
}
initializePopups();
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 29948e1cf7b1202303957c4c4b52d0fd75185c8d..0a03f2d15a8abb893b17d9c51eaf5b6e564ed052 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -20,6 +20,7 @@
*/
abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTestCase {
use Storm_Test_THelpers;
+
protected
$_registry_sql,
$_storm_default_to_volatile = false;
@@ -306,6 +307,22 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
$this->fail("Flash messenger contains a popup");
}
}
+
+
+
+ public function xhprofile($closure) {
+ xhprof_enable();
+
+ $closure();
+
+ $xhprof_data = xhprof_disable();
+ require_once "xhprof/xhprof_lib/utils/xhprof_lib.php";
+ require_once "xhprof/xhprof_lib/utils/xhprof_runs.php";
+
+ $xhprof_runs = new XHProfRuns_Default();
+ $run_id = $xhprof_runs->save_run($xhprof_data, "xhprof_testing");
+ var_dump('XHProfile data: ' . BASE_URL."/xhprof/xhprof_html/index.php?run={$run_id}&source=xhprof_testing");
+ }
}
?>
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php b/tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php
index 25a0cf157d6fdc1f3241a4c7c285e1f600f43711..3cbedea6db63b24887a68ca650206547b7342b85 100644
--- a/tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php
+++ b/tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php
@@ -103,23 +103,23 @@ class AdminAvisModerationControllerAvisToModerateTest extends AdminAvisModeratio
}
public function testClubCinqLinkValidate() {
- $this->assertXPath("//a[@href='/admin/modo/validateavisnotice/id/38']");
+ $this->assertXPath("//a[@href='/admin/modo/validateavisnotice/id/38/active_tab/1/page/0']");
}
public function testRoutardLinkValidate() {
- $this->assertXPath("//a[@href='/admin/modo/validateavisnotice/id/42']");
+ $this->assertXPath("//a[@href='/admin/modo/validateavisnotice/id/42/active_tab/1/page/0']");
}
public function testClubCinqLinkDel() {
- $this->assertXPath("//a[@href='/admin/modo/delavisnotice/id/38']");
+ $this->assertXPath("//a[@href='/admin/modo/delavisnotice/id/38/active_tab/1/page/0']");
}
public function testRoutardLinkDel() {
- $this->assertXPath("//a[@href='/admin/modo/delavisnotice/id/42']");
+ $this->assertXPath("//a[@href='/admin/modo/delavisnotice/id/42/active_tab/1/page/0']");
}
public function testClubCinqLinkEdit() {
- $this->assertXPath("//a[@href='/admin/modo/editavisnotice/id/42']");
+ $this->assertXPath("//a[@href='/admin/modo/editavisnotice/id/42/active_tab/1/page/0']");
}
}
@@ -150,7 +150,7 @@ class AdminAvisModerationControllerUnknownAvisEditTest extends AdminAvisModerati
}
public function testRedirectToAvisPage() {
- $this->assertRedirectTo('/admin/modo/avisnotice');
+ $this->assertRedirectTo('/admin/modo/avisnotice/status/0/active_tab/1/page/0');
}
}
@@ -228,7 +228,7 @@ class AdminAvisModerationControllerAvisEditPostTest extends AdminAvisModerationC
}
public function testRedirectToAvisPage() {
- $this->assertRedirectTo('/admin/modo/avisnotice');
+ $this->assertRedirectTo('/admin/modo/avisnotice/status/0/active_tab/1/page/0');
}
@@ -303,7 +303,7 @@ class AdminAvisModerationControllerAvisValidateTest extends AdminAvisModerationC
}
public function testRedirectToAvisPage() {
- $this->assertRedirectTo('/admin/modo/avisnotice');
+ $this->assertRedirectTo('/admin/modo/avisnotice/status/0/active_tab/1/page/0');
}
public function testStatutIsOne() {
diff --git a/tests/application/modules/admin/controllers/CatalogueControllerTest.php b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
index c00f210df2e9d4fe748640e3b23189f53a3eb025..48dd4c04870c852fe7f91bc80ffaeab32d4a64e7 100644
--- a/tests/application/modules/admin/controllers/CatalogueControllerTest.php
+++ b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
@@ -355,7 +355,7 @@ class CatalogueControllerWithModoPortailTotalAccessIndexTest extends AdminCatalo
/** @test */
public function pageShouldContainsPermalinkForCataloguePolitique() {
- $this->assertXPathContentContains('//div//span', "recherche/simple/id_catalogue/200");
+ $this->assertXPath('//img[contains(@class, "permalink")][contains(@data-url, "recherche/simple/id_catalogue/200")]');
}
@@ -1266,7 +1266,7 @@ class CatalogueControllerPaniersHistoireTest extends AdminCatalogueControllerTes
/** @test */
public function pageShouldContainsPermalinkForPanier() {
- $this->assertXPathContentContains('//div//span', "recherche/simple/id_panier/8");
+ $this->assertXPath('//img[contains(@class, "permalink")][contains(@data-url, "recherche/simple/id_panier/8")]');
}
@@ -1467,6 +1467,9 @@ class CatalogueControllerPaniersRemovePanierAndUnindexTest extends AbstractContr
public function setUp() {
parent::setUp();
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Catalogue')
+ ->whenCalled('saveThesaurus')->answers(true);
+
$pomme = $this->fixture('Class_Notice',
['id' => 1456,
'clef_alpha' => 'POMME',
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index d41c4be3ae52932e19d0ac81e8eb82f664163e59..e65d3e03c4712cd5429e23caec3887d966d10a8d 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -724,7 +724,7 @@ class CmsControllerArticleConcertEditActionTest extends CmsControllerWithPermiss
/** @test */
public function permalinkShouldContainsArticleAbsoluteUrl() {
- $this->assertXPathContentContains('//div//span', "cms/articleview/id/4");
+ $this->assertXPath('//img[contains(@class, "permalink")][@data-url="http://localhost' . BASE_URL . '/cms/articleview/id/4"]');
}
@@ -2061,14 +2061,14 @@ class CmsControllerArticleEditActionWithFormTest extends CmsControllerWithPermis
'description' => 'Mon article avec formulaire',
'contenu' => '<form action="/formulaire/add/id_article/5" method="POST" name="mon form">',
'debut' => '2011-03-20',
- 'fin' => '2011-03-28',
+ 'fin' => '',
'events_debut' => '2011-03-27 21:00',
'events_fin' => '2011-03-28 22:30',
'cacher_titre' => 1,
'langue' => 'fr',
'tags' => 'concert;jazz',
'avis' => true,
- 'indexation' => false,
+ 'indexation' => true,
'date_creation' => '2010-12-25 10:23:23',
'date_maj' => '2010-12-26 11:12:34',
'domaine_ids' => [11,12],
@@ -2080,6 +2080,12 @@ class CmsControllerArticleEditActionWithFormTest extends CmsControllerWithPermis
}
+ /** @test */
+ public function artcile5ShouldNotBeIndexed() {
+ $this->assertNull(Class_Article::find(5)->getNotice());
+ }
+
+
/** @test */
public function emailShouldBePresentOnFourthPosition() {
$this->assertXPath("//table//tr[5]//input[@name='destination_email'][@type='email']",
@@ -2546,7 +2552,7 @@ class CmsControllerArticleExistingTraductionEditTest extends CmsControllerWithPe
/** @test */
function permalinkShouldContainsArticleUrl() {
- $this->assertXPathContentContains('//div//span', "cms/articleview/id/41");
+ $this->assertXPath('//img[contains(@class, "permalink")][@data-url="http://localhost' . BASE_URL . '/cms/articleview/id/41"]');
}
diff --git a/tests/application/modules/admin/controllers/MenusControllerTest.php b/tests/application/modules/admin/controllers/MenusControllerTest.php
index d122e917fba5a23382f262068e340f8b6c9f0457..9858bcf35ee3a1fffa95d6335534ce2d8b603633 100644
--- a/tests/application/modules/admin/controllers/MenusControllerTest.php
+++ b/tests/application/modules/admin/controllers/MenusControllerTest.php
@@ -16,16 +16,18 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
require_once 'AdminAbstractControllerTestCase.php';
abstract class Admin_MenusControllerProfilJazzTestCase extends Admin_AbstractControllerTestCase {
- protected $_profil_jazz;
+ protected
+ $_storm_default_to_volatile = true,
+ $_profil_jazz;
public function setUp() {
- parent::setUp();
+ parent::setUp();
$cfg_menus = ['H' => ['libelle' => 'Menu horizontal',
'picto' => 'vide.gif',
@@ -68,7 +70,7 @@ abstract class Admin_MenusControllerProfilJazzTestCase extends Admin_AbstractCon
'libelle' => 'Libelle du catalogue',
'preferences' => ['titre' => 'Titre du catalogue'],
'picto' => 'vide.gif' ]
-
+
],
],
@@ -87,8 +89,8 @@ abstract class Admin_MenusControllerProfilJazzTestCase extends Admin_AbstractCon
class Admin_MenusControllerProfilJazzIndexActionTest extends Admin_MenusControllerProfilJazzTestCase {
public function setUp() {
- parent::setUp();
-
+ parent::setUp();
+
$this->dispatch('admin/menus/index?'.
http_build_query(array('id_profil' => '5',
'id_bib' => 'null',
@@ -149,7 +151,7 @@ class Admin_MenusControllerEditMenuBibNumTest extends Admin_AbstractControllerTe
->setParentId(4)
->setSousCategories(array())
->setLibelle('BD')
- ->setAlbums(array(
+ ->setAlbums(array(
$fitzgerald = Class_Album::getLoader()
->newInstanceWithId(421)
->setCatId(42)
@@ -160,7 +162,7 @@ class Admin_MenusControllerEditMenuBibNumTest extends Admin_AbstractControllerTe
->setCatId(42)
->setTitre('Armstrong')
))
- )
+ )
);
@@ -173,7 +175,7 @@ class Admin_MenusControllerEditMenuBibNumTest extends Admin_AbstractControllerTe
->answers(array($fitzgerald, $armstrong));
}
-
+
public function setUp() {
parent::setUp();
$this->createBibNum();
@@ -196,16 +198,16 @@ class Admin_MenusControllerEditMenuBibNumTest extends Admin_AbstractControllerTe
/** @test */
function albumSelectShouldContainsFitzgerald() {
- $this->assertXPathContentContains("//select[@id='album_id']//option[@value='421']",
- "Jazz>BD>Fitzgerald",
+ $this->assertXPathContentContains("//select[@id='album_id']//option[@value='421']",
+ "Jazz>BD>Fitzgerald",
$this->_response->getBody());
}
/** @test */
function albumSelectShouldContainsArmstrong() {
- $this->assertXPathContentContains("//select//option[@value='422'][@selected='selected']",
- "Jazz>BD>Armstrong",
+ $this->assertXPathContentContains("//select//option[@value='422'][@selected='selected']",
+ "Jazz>BD>Armstrong",
$this->_response->getBody());
}
@@ -216,6 +218,9 @@ class Admin_MenusControllerEditMenuBibNumTest extends Admin_AbstractControllerTe
}
}
+
+
+
class Admin_MenusControllerEditMenuAlbumLinkTest extends Admin_AbstractControllerTestCase {
public function setUp() {
parent::setUp();
@@ -231,10 +236,10 @@ class Admin_MenusControllerEditMenuAlbumLinkTest extends Admin_AbstractControlle
'libelle' => 'Lien vers un album',
'picto' => 'book.png',
'preferences' => 'album_id=421')));
-
+
}
-
+
/** @test */
public function linkAlbumWithoutCategoryShouldReturnCategoryNotClassified() {
$this->assertXPathContentContains('//div', 'non classé', $this->_response->getBody());
@@ -324,7 +329,7 @@ class Admin_MenusControllerProfilJazzPostCalendrierActionTest extends Admin_Menu
/** @test */
public function responseShouldBeContainsMajProprietesTitleAgenda() {
- $this->assertContains('parent.retourMajProprietes("3","Agenda","vide.gif","titre=Agenda|nb_events=10")',
+ $this->assertContains('parent.retourMajProprietes("3","Agenda","vide.gif","titre=Agenda|nb_events=10")',
$this->_response->getBody());
}
}
@@ -337,6 +342,9 @@ class Admin_MenusControllerProfilJazzPostCatalogueActionTest extends Admin_Menus
public function setUp() {
parent::setUp();
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
+ ->whenCalled('findAllBelongsToAdmin')->answers([]);
+
$this->postDispatch('admin/menus/catalogue?'.http_build_query(['id_module' => 7,
'id_profil' => 5,
'type_menu' => 'CATALOGUE']),
@@ -345,7 +353,7 @@ class Admin_MenusControllerProfilJazzPostCatalogueActionTest extends Admin_Menus
/** @test */
public function responseShouldBeContainsNouveaute() {
- $this->assertContains('parent.retourMajProprietes("7","Nouveauté","vide.gif","titre=Titre du catalogue',
+ $this->assertContains('parent.retourMajProprietes("7","Nouveauté","vide.gif","titre=Titre du catalogue',
$this->_response->getBody());
}
}
@@ -357,13 +365,31 @@ class Admin_MenusControllerProfilJazzEditCatalogueActionTest extends Admin_Menus
public function setUp() {
parent::setUp();
- $panier_bd = Class_PanierNotice::newInstanceWithId(1, ['libelle' => 'bd']);
- $panier_romans = Class_PanierNotice::newInstanceWithId(2, ['libelle' => 'romans']);
- $panier_musique = Class_PanierNotice::newInstanceWithId(3, ['libelle' => 'musique']);
-
+ $panier_bd = $this->fixture('Class_PanierNotice',
+ ['id' => 1,
+ 'libelle' => 'bd']);
+
+ $panier_romans = $this->fixture('Class_PanierNotice',
+ ['id' => 2,
+ 'libelle' => 'romans']);
+
+ $panier_musique = $this->fixture('Class_PanierNotice',
+ ['id' => 3,
+ 'libelle' => 'musique']);
+
+ $panier_autres = $this->fixture('Class_PanierNotice',
+ ['id' => 4,
+ 'libelle' => 'autres']);
+
+
+ $this->fixture('Class_Catalogue',
+ ['id' => 9,
+ 'libelle' => 'Domaine livres',
+ 'panier_notices' => [$panier_romans, $panier_bd]]);
+
Class_Users::getIdentity()->setPaniers([$panier_bd]);
+
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('findAllWithCatalogue')->answers([$panier_bd, $panier_romans])
->whenCalled('findAllBelongsToAdmin')->answers([$panier_musique]);
$this->dispatch('admin/menus/catalogue?'.http_build_query(['id_module' => 7,
@@ -388,9 +414,15 @@ class Admin_MenusControllerProfilJazzEditCatalogueActionTest extends Admin_Menus
/** @test */
public function selectIdPanierShouldContainsPanierMusique() {
- $this->assertXPathContentContains('//select[@name="id_panier"]/option[@value="3"]',
+ $this->assertXPathContentContains('//select[@name="id_panier"]/option[@value="3"]',
'musique');
}
+
+
+ /** @test */
+ public function selectIdPanierShouldNotContainsPanierAutres() {
+ $this->assertNotXPath('//select[@name="id_panier"]/option[@value="4"]');
+ }
}
?>
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
index d20548b8156661ceed159921d172f440e9b69ff5..1265516790cbd31d6aba5f035887772d376ce6da 100644
--- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
@@ -257,7 +257,7 @@ class ModoControllerFormulaireForArticleValidateFormulaireMireilleTest extends M
class ModoControllerFormulaireForArticleDeleteTest extends ModoControllerFormulaireForArticleTestCase {
public function setUp() {
parent::setUp();
-
+ $_SERVER['HTTP_REFERER'] = '/admin/modo/formulaires/id_article/12';
$this->dispatch('admin/modo/delete-formulaire/id_article/12/id/5', true);
}
diff --git a/tests/application/modules/admin/controllers/ModoControllerTest.php b/tests/application/modules/admin/controllers/ModoControllerTest.php
index 1ca2ae894bbafba4a5def315c7f97a7422478540..2f46be2ff81945c77a61d56f0a9cac788902bc68 100644
--- a/tests/application/modules/admin/controllers/ModoControllerTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerTest.php
@@ -691,7 +691,7 @@ class ModoControllerAllReviewsActionTest extends ModoControllerIndexActionTestCa
public function setup() {
parent::setup();
- $this->dispatch('admin/modo/allreviews', true);
+ $this->dispatch('admin/modo/avisnotice/status/1', true);
}
@@ -736,21 +736,21 @@ class ModoControllerAllReviewsPageActionTest extends ModoControllerIndexActionTe
/** @test **/
public function moderatedReviewsShouldBeDisplayedEvenIfPageIsOutOfBound() {
- $this->dispatch('admin/modo/allreviews/page/10', true);
+ $this->dispatch('admin/modo/avisnotice/status/1/page/10', true);
$this->assertXpathContentContains('//div//h2', 'B comme bière : la bière expliquée aux (grands) enfants');
}
/** @test **/
public function page3ShouldNotConstainsTheLastReviewSaved139() {
- $this->dispatch('admin/modo/allreviews/page/3/active_tab/1', true);
+$this->dispatch('admin/modo/avisnotice/status/1/page/3/active_tab/1', true);
$this->assertNotXpathContentContains('//div[@class="critique"]//div[@class="contenu_critique"]//a[contains(@href, "blog/viewavis")]', '139');
}
/** @test */
public function page1ShouldContains10Reviews() {
- $this->dispatch('admin/modo/allreviews/page/1/active_tab/1', true);
+ $this->dispatch('admin/modo/avisnotice/status/1/page/1/active_tab/1', true);
$this->assertXPathContentContains('//div[2]/span', 'résultats sur cette page.', $this->_response->getBody());
}
}
diff --git a/tests/application/modules/admin/controllers/ModulesControllerTest.php b/tests/application/modules/admin/controllers/ModulesControllerTest.php
index ebd0d4520dc386a6286dc11639493c7a3f764856..c83631bfb714750bdf967b75079a7542643b50d3 100644
--- a/tests/application/modules/admin/controllers/ModulesControllerTest.php
+++ b/tests/application/modules/admin/controllers/ModulesControllerTest.php
@@ -374,30 +374,41 @@ class ModulesControllerRegisterConfigTest extends Admin_AbstractControllerTestCa
/** @test */
- public function modulesAuthRegisterInputBarreNavShouldContainsSInscrire() {
+ public function barreNavShouldContainsSInscrire() {
$this->assertXPath('//input[@name="barre_nav"][@value="S\'inscrire"]');
}
/** @test */
- public function modulesAuthRegisterInputTitreShouldContainsDemandeDinscription() {
+ public function titreShouldContainsDemandeDinscription() {
$this->assertXPath('//input[@type="text"][@name="titre"][@value="Demande d\'inscription"]');
}
/** @test */
- public function modulesAuthRegisterTextareaRegisterHelpShouldContainsDefautMessage() {
-
+ public function registerHelpShouldContainsDefautMessage() {
$this->assertXPathContentContains('//textarea[@name="register_help"]',
'mail de confirmation');
}
/** @test */
- public function modulesAuthRegisterTextareaRegisterConfirmShouldContainsDefautMessage() {
+ public function registerConfirmShouldContainsDefautMessage() {
$this->assertXPathContentContains('//textarea[@name="register_confirm"]',
'Cher Internaute,');
}
+
+
+ /** @test */
+ public function optionalLibraryShouldBePresent() {
+ $this->assertXPath('//select[@name="library"]');
+ }
+
+
+ /** @test */
+ public function optionalCardNumberShouldBePresent() {
+ $this->assertXPath('//select[@name="card_number"]');
+ }
}
diff --git a/tests/application/modules/opac/controllers/AuthControllerTest.php b/tests/application/modules/opac/controllers/AuthControllerTest.php
index 647a72889def47cf6dcdc675dda447245eb2a0af..e9d27adfb46ac008cd6d7cdb3c3a2c5efb97a2f9 100644
--- a/tests/application/modules/opac/controllers/AuthControllerTest.php
+++ b/tests/application/modules/opac/controllers/AuthControllerTest.php
@@ -21,6 +21,8 @@
require_once 'AbstractControllerTestCase.php';
abstract class PortailWithOneLoginModuleTestCase extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
@@ -229,8 +231,6 @@ class AuthControllerNobodyLoggedActivateTest extends AuthControllerNobodyLoggedT
public function setUp() {
parent::setUp();
- Class_UsersNonValid::beVolatile();
- Class_Users::beVolatile();
$this->fixture('Class_AdminVar', ['id' => 'USER_NON_VALIDATED',
'valeur' => self::ERROR_MESSAGE]);
$this->fixture('Class_AdminVar', ['id' => 'USER_VALIDATED',
@@ -1174,6 +1174,7 @@ class AuthControllerLoginActionWithDefaultPreferencesRenderTest extends AuthCont
}
class AuthControllerLostPasswordUnknownPostTest extends AbstractControllerTestCase{
+ protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
@@ -1196,6 +1197,7 @@ class AuthControllerLostPasswordUnknownPostTest extends AbstractControllerTestCa
}
class AuthControllerLostPasswordNoMailPostTest extends AbstractControllerTestCase{
+ protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
@@ -1255,13 +1257,13 @@ class AuthControllerNobodyLoggedAndRegistrationAllowedRegisterTest extends AuthC
/** @test */
- public function H1ShouldContainsDemandDInscription() {
+ public function h1ShouldContainsDemandDInscription() {
$this->assertXPathContentContains('//h1', 'Demande d\'inscription');
}
/** @test */
- public function ParagraphRegisterHelpShouldContainsMailDeConfirmation() {
+ public function paragraphRegisterHelpShouldContainsMailDeConfirmation() {
$this->assertXPathContentContains('//p', 'mail de confirmation');
}
@@ -1304,12 +1306,40 @@ class AuthControllerNobodyLoggedAndRegistrationAllowedRegisterTest extends AuthC
+class AuthControllerNobodyLoggedAndRegistrationAllowedWithOptionalFieldsRegisterTest
+ extends AuthControllerNobodyLoggedTestCase {
+
+ public function setUp() {
+ parent::setUp();
+ Class_AdminVar::newInstanceWithId('INTERDIRE_ENREG_UTIL', ['valeur' => 0]);
+
+ Class_Profil::getCurrentProfil()
+ ->setCfgModulesPreferences(['fields' => 'library:optional;card_number:required'],
+ 'auth', 'register');
+
+ $this->dispatch('auth/register', true);
+ }
+
+
+ /** @test */
+ public function libraryShouldBeHereAndOptional() {
+ $this->assertXPath('//select[@name="id_site"]');
+ $this->assertXPath('//label[@for="id_site"][not(contains(@class, "required"))]');
+ }
+
+
+ /** @test */
+ public function cardNumberShouldBeHereAndRequired() {
+ $this->assertXPath('//input[@type="text"][@name="idabon"]');
+ $this->assertXPath('//label[@for="idabon"][contains(@class, "required")]');
+ }
+}
+
+
class AuthControllerNobodyLoggedRegisterPostRightDatasTest extends AuthControllerNobodyLoggedTestCase {
public function setUp() {
parent::setUp();
- Class_Users::beVolatile();
- Class_UsersNonValid::beVolatile();
ZendAfi_Form_Element_Captcha::beValid();
$this->mock_transport = new MockMailTransport();
@@ -1396,7 +1426,9 @@ class AuthControllerNobodyLoggedRegisterPostRightDatasTest extends AuthControlle
'login' => 'mario',
'password' => 'secret',
'mail' => 'mario@afi-sa.fr',
- 'cle' => md5('mario@afi-sa.fr')],
+ 'cle' => md5('mario@afi-sa.fr'),
+ 'id_site' => 0,
+ 'idabon' => ''],
$user->getRawAttributes());
}
}
@@ -1524,11 +1556,11 @@ class AuthControllerNobodyLoggedRegisterPostWrongDataTest extends AuthController
class PortailWithOneLoginModuleTestAndLoggedUserCase extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
- Class_IntBib::beVolatile();
-
$cfg_accueil = ['modules' => [4 => ['division' => '4',
'id_module' => 4,
'type_module' => 'LOGIN',
@@ -1637,7 +1669,6 @@ class AuthControllerNobodyLoggedAndRegisterNewsletterWithWrongNewsletterTest ext
public function setUp() {
parent::setUp();
- Class_Newsletter::beVolatile();
$this->dispatch('/opac/auth/newsletter-register/id/1', true);
}
@@ -1730,9 +1761,6 @@ class AuthControllerPostRegisterNewsletterDailyNewsTest extends AuthControllerNo
Class_Profil::getCurrentProfil()
->setMailSite('tom@afi.fr');
- Class_Users::beVolatile();
- Class_UsersNonValid::beVolatile();
-
$this->fixture('Class_Newsletter', ['id' => 5, 'titre' => 'Daily News']);
$this->postDispatch('/opac/auth/newsletter-register/id/5', ['email' => 'iwanttobespamed@abo.com',
@@ -1834,8 +1862,6 @@ class AuthControllerPostRegisterNewsletterDailyNewsWithNonUniqueMailTest extends
'password' => 'pwd',
'mail' => 'imalreadyused@mail.com']);
- Class_UsersNonValid::beVolatile();
-
$this->fixture('Class_Newsletter',
['id' => 5,
'titre' => 'Daily News']);
@@ -1866,8 +1892,6 @@ class AuthControllerPostRegisterNewsletterDailyNewsWithBadMailTest extends AuthC
public function setUp() {
parent::setUp();
- Class_Users::beVolatile();
- Class_UsersNonValid::beVolatile();
$this->fixture('Class_Newsletter', ['id' => 5, 'titre' => 'Daily News']);
$this->postDispatch('/opac/auth/newsletter-register/id/5', ['email' => 'bad_mail!',
@@ -1912,7 +1936,6 @@ class AuthControllerNewsletterActiveUserWithWrongParamsTest extends AuthControll
/** @test */
public function wrongNewsletterShouldRedirectedToIndex() {
- Class_Newsletter::beVolatile();
$this->dispatch('opac/auth/newsletter-active-user/c/4897sd8fsdf/id/1', true);
$this->assertRedirectTo('/');
}
@@ -1935,10 +1958,6 @@ class AuthControllerNewsletterActiveUserTest extends AuthControllerNoBodyLoggedT
public function setUp() {
parent::setUp();
- Class_NewsletterSubscription::beVolatile();
-
- Class_Users::beVolatile();
-
$this->fixture('Class_Newsletter',[
'id' => 1,
'titre' => 'News of the month']);
@@ -1988,9 +2007,11 @@ class AuthControllerNewsletterActiveUserTest extends AuthControllerNoBodyLoggedT
class AuthControllerTomLoggedRegisterNewsletterTestCase extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
- Class_NewsletterSubscription::beVolatile();
+
$this->fixture('Class_Newsletter',
['id' => 5,
'titre' => 'Daily News']);
@@ -2057,7 +2078,6 @@ class AuthControllerNewsletterUnsubscribeWrongIdTest extends AuthControllerNobod
public function setUp() {
parent::setUp();
- Class_Newsletter::beVolatile();
$this->dispatch('auth/newsletter-unsubscribe/id/1', true);
}
@@ -2078,6 +2098,7 @@ class AuthControllerNewsletterUnsubscribeWrongIdTest extends AuthControllerNobod
class AuthControllerNewsletterUnsubscribeTest extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
@@ -2120,6 +2141,8 @@ class AuthControllerNewsletterUnsubscribeTest extends AbstractControllerTestCase
class AuthControllerNewsletterRegisterSendMailWrongMailConfigurationTest extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
@@ -2133,9 +2156,6 @@ class AuthControllerNewsletterRegisterSendMailWrongMailConfigurationTest extends
Class_Profil::getCurrentProfil()
->setMailSite('tom@afi.fr');
- Class_Users::beVolatile();
- Class_UsersNonValid::beVolatile();
-
$this->fixture('Class_Newsletter', ['id' => 5, 'titre' => 'Daily News']);
$this->postDispatch('/opac/auth/newsletter-register/id/5', ['email' => 'iwanttobespamed@abo.it',
@@ -2152,10 +2172,11 @@ class AuthControllerNewsletterRegisterSendMailWrongMailConfigurationTest extends
class AuthControllerNewsletterRegisterWithAutoSubscribeNewsletterTest extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
- Class_NewsletterSubscription::beVolatile();
- Class_Users::beVolatile();
+
$this->fixture('Class_UsersNonValid', [
'id' => 1,
'login' => 'future@i.am',
@@ -2194,5 +2215,4 @@ class AuthControllerNewsletterRegisterWithAutoSubscribeNewsletterTest extends Ab
public function messageShouldBeAsExpected() {
$this->assertXPathContentContains('//p', "Vous avez bien été abonné à la newsletter");
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/BlogControllerTest.php b/tests/application/modules/opac/controllers/BlogControllerTest.php
index c01c62513941be41e1a273e92b26b1c476e153ab..6144366da1567f14fad2bcb3d12ee21cdf43f6a8 100644
--- a/tests/application/modules/opac/controllers/BlogControllerTest.php
+++ b/tests/application/modules/opac/controllers/BlogControllerTest.php
@@ -145,7 +145,9 @@ class BlogControllerHierarchicalTest extends AbstractControllerTestCase {
/** @test */
public function kspShouldBePresent() {
- $this->assertXPathContentContains('//h2', 'Kerbal Space Program',$this->_response->getBody());
+ $this->assertXPathContentContains('//h2',
+ 'Kerbal Space Program',
+ $this->_response->getBody());
}
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index c366143b22ad53ea2e64ac14ce3070d2583b5f83..009805941eb249b1f843e7657714c79b8a8998d3 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -998,14 +998,7 @@ class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCas
/** @test */
public function socialNetworksContainerShouldBePresent() {
//on garde le @id="reseaux-sociaux-224" pour la compatibilité avec les persos graphiques
- $this->assertXpath('//div[@class="reseaux-sociaux"][contains(@data-article-url, "cms/reseau/id_article/224")]/img[contains(@src, "patience.gif")]');
- }
-
-
- /** @test */
- public function initializeResauxSociauxScriptShouldBePresent() {
- $this->assertXPathContentContains('//script',
- "initializeReseauxSociaux");
+ $this->assertXpath('//div[contains(@class, "reseaux-sociaux")]//img[contains(@data-url, "cms/articleview/id/224")]');
}
diff --git a/tests/application/modules/opac/controllers/PanierControllerTest.php b/tests/application/modules/opac/controllers/PanierControllerTest.php
index d6777afc4119f19faad7070cb9313b0d1b32c6c0..80d6e0f7f4ecdd007d44a1e6f958109e3a510772 100644
--- a/tests/application/modules/opac/controllers/PanierControllerTest.php
+++ b/tests/application/modules/opac/controllers/PanierControllerTest.php
@@ -52,14 +52,11 @@ abstract class PanierControllerSimpleLoggedUserTestCase extends AbstractControll
abstract class PanierControllerTestCase extends AbstractControllerTestCase {
+ protected
+ $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
- Class_Users::beVolatile();
- Class_NoticeDomain::beVolatile();
- Class_UserGroup::beVolatile();
- Class_Notice::beVolatile();
- Class_PanierNotice::beVolatile();
- Class_PanierNoticeCatalogue::beVolatile();
$this->manon = $this->fixture('Class_Users', [
'id' => 23,
@@ -120,39 +117,41 @@ abstract class PanierControllerTestCase extends AbstractControllerTestCase {
'order' => 'FIELD(clef_alpha, "MONTESPAN")'])
->answers([$montespan]);
- $this->panier_loader = Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('save')->answers(true)
- ->whenCalled('delete')->answers(true)
-
- ->whenCalled('findAll')->answers([$this->panier_bd, $this->panier_romans])
- ->whenCalled('findAllBy')
- ->with(['role' => 'user', 'model' => $this->manon])
- ->answers([$this->panier_bd, $this->panier_romans]);
-
- $panier_domaine_histoire = Class_PanierNoticeCatalogue::newInstanceWithId(71);
+ $panier_domaine_histoire = $this->fixture('Class_PanierNoticeCatalogue',
+ ['id' => 71]);
$panier_domaine_histoire
- ->setPanierNotice(Class_PanierNotice::newInstanceWithId(38,
- ['libelle' => 'selection jeunesse',
- 'user' => Class_Users::newInstanceWithId(45, ['nom' => 'Dupont']),
- 'date_maj' => '19/01/2013',
- 'panier_notice_catalogues' => [$panier_domaine_histoire]]))
- ->setCatalogue(Class_Catalogue::newInstanceWithId(97, ['libelle' => 'histoire']))->save();
-
-
- $panier_domaine_bd = Class_PanierNoticeCatalogue::newInstanceWithId(72);
+ ->setPanierNotice($this->fixture('Class_PanierNotice',
+ ['id' => 38,
+ 'libelle' => 'selection jeunesse',
+ 'user' => Class_Users::newInstanceWithId(45, ['nom' => 'Dupont']),
+ 'date_maj' => '19/01/2013',
+ 'panier_notice_catalogues' => [$panier_domaine_histoire]]))
+ ->setCatalogue($this->fixture('Class_Catalogue',
+ ['id' => 97,
+ 'libelle' => 'histoire']))
+ ->save();
+
+
+ $panier_domaine_bd = $this->fixture('Class_PanierNoticeCatalogue',
+ ['id' => 72]);
$panier_domaine_bd
->setPanierNotice($this->panier_bd)
- ->setCatalogue(Class_Catalogue::newInstanceWithId(199,
- ['libelle' => 'bd',
- 'panier_notice_catalogues' => [$panier_domaine_bd]]))->save();
-
- $panier_domaine_orphelin = Class_PanierNoticeCatalogue::newInstanceWithId(456);
+ ->setCatalogue($this->fixture('Class_Catalogue',
+ ['id' => 199,
+ 'libelle' => 'bd',
+ 'panier_notice_catalogues' => [$panier_domaine_bd]]))
+ ->save();
+
+ $panier_domaine_orphelin = $this->fixture('Class_PanierNoticeCatalogue',
+ ['id' => 456]);
$panier_domaine_orphelin
->setPanierNotice($this->panier_orphelin)
- ->setCatalogue(Class_Catalogue::newInstanceWithId(1789,
- ['libelle' => 'orphelin',
- 'panier_notice_catalogues' => [$panier_domaine_orphelin]]))->save();
+ ->setCatalogue($this->fixture('Class_Catalogue',
+ ['id' => 1789,
+ 'libelle' => 'orphelin',
+ 'panier_notice_catalogues' => [$panier_domaine_orphelin]]))
+ ->save();
}
}
@@ -442,6 +441,7 @@ class PanierControllerSupprimerNoticeBlacksadFromBDTest extends PanierController
public function setUp() {
parent::setUp();
$this->dispatch('/panier/paniersupprimernotice/id_panier/2/id_notice/12', true);
+ Class_PanierNotice::clearCache();
}
@@ -451,13 +451,6 @@ class PanierControllerSupprimerNoticeBlacksadFromBDTest extends PanierController
}
- /** @test */
- public function panierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
- }
-
-
- /** @test */
public function responseShouldRedirectToIndex() {
$this->assertRedirectTo('/opac/panier/index/id_panier/2');
}
@@ -469,12 +462,13 @@ class PanierControllerSupprimerBDTest extends PanierControllerTestCase {
public function setUp() {
parent::setUp();
$this->dispatch('/panier/supprimerpanier/id_panier/2', true);
+ Class_PanierNotice::clearCache();
}
/** @test */
public function panierShouldHaveBeenDeleted() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('delete'));
+ $this->assertEmpty(Class_PanierNotice::find(2));
}
@@ -493,14 +487,15 @@ class PanierControllerOtherUserSecurityTest extends PanierControllerTestCase {
Class_PanierNotice::newInstanceWithId(39,
['libelle' => 'panier Markus',
'user' => Class_Users::newInstanceWithId(98, ['nom' => 'Markus']),
- 'date_maj' => '19/01/2013']);
+ 'date_maj' => '19/01/2013'])->assertSave();
}
/** @test */
public function panierDomaineHistoireShouldNotBeDeletable() {
$this->dispatch('/panier/supprimerpanier/id_panier/39', true);
- $this->assertFalse(Class_PanierNotice::methodHasBeenCalled('delete'));
+ Class_PanierNotice::clearCache();
+ $this->assertNotEmpty(Class_PanierNotice::find(39));
}
@@ -521,25 +516,34 @@ class PanierControllerOtherUserSecurityTest extends PanierControllerTestCase {
/** @test */
public function addPanierToMarkusShouldBeForbidden() {
$this->dispatch('/panier/panierajouternotice/id_panier/39/id_notice/12', true);
- $this->assertFalse(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
+ $this->assertNotContains('BLACKSAD',
+ Class_PanierNotice::find(39)->getClesNotices());
$this->assertRedirectTo('/opac/panier');
}
/** @test */
- public function addPanierAjaxToMarkusShouldBeForbidden() {
+ public function addPanierAjaxToMarkusByAbonneSIGBShouldBeForbidden() {
$this->manon->setRoleLevel(ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB);
ZendAfi_Auth::getInstance()->logUser($this->manon);
+
$this->postDispatch('/panier/ajout-ajax/id_panier/39/id_notice/12', []);
- $this->assertFalse(Class_PanierNotice::methodHasBeenCalled('save'));
+ $this->assertNotContains('BLACKSAD',
+ Class_PanierNotice::find(39)->getClesNotices());
+
$this->assertRedirectTo('/opac/panier');
}
/** @test */
public function removeNoticeFromPanierMarkusShouldBeForbidden() {
+ Class_PanierNotice::find(39)->setClesNotices(['BLACKSAD'])->assertSave();
$this->postDispatch('/panier/paniersupprimernotice/id_panier/39/id_notice/12', []);
- $this->assertFalse(Class_PanierNotice::methodHasBeenCalled('save'));
+
+ Class_PanierNotice::clearCache();
+ $this->assertContains('BLACKSAD', Class_PanierNotice::find(39)->getClesNotices());
+
$this->assertRedirectTo('/opac/panier');
}
@@ -547,7 +551,8 @@ class PanierControllerOtherUserSecurityTest extends PanierControllerTestCase {
/** @test */
public function majTitrePanierMarkusShouldBeForbidden() {
$this->postDispatch('/panier/majtitrepanier/id_panier/39/', ['new_libelle' => 'crack']);
- $this->assertFalse(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
+ $this->assertEquals('panier Markus', Class_PanierNotice::find(39)->getLibelle());
$this->assertRedirectTo('/opac/panier');
}
}
@@ -617,17 +622,9 @@ class PanierControllerAjoutNoticeBlackSadToPanierMesRomansTest extends PanierCon
public function setUp() {
parent::setUp();
- $this->panier_loader
- ->whenCalled('maxIdPanierForUser')
- ->answers(4);
-
$this->dispatch('/panier/panierajouternotice/id_panier/15/id_notice/12', true);
- }
-
-
- /** @test */
- public function panierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
+ $this->panier_romans = Class_PanierNotice::find(15);
}
@@ -651,10 +648,6 @@ class PanierControllerAjoutUnknownNoticeToPanierMesRomansTest extends PanierCont
public function setUp() {
parent::setUp();
- $this->panier_loader
- ->whenCalled('maxIdPanierForUser')
- ->answers(4);
-
$this->dispatch('/panier/panierajouternotice/id_panier/15/id_notice/-1', true);
}
@@ -673,12 +666,7 @@ class PanierControllerAjoutNoticeBlackSadToPanierDomaineHistoireTest extends Pan
parent::setUp();
$this->manon->changeRoleTo(ZendAfi_Acl_AdminControllerRoles::MODO_PORTAIL);
$this->dispatch('/panier/panierajouternotice/id_panier/38/id_notice/12', true);
- }
-
-
- /** @test */
- public function panierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
}
@@ -698,14 +686,10 @@ class PanierControllerModifierTitrePanierMesRomansToMesLivresTest extends Panier
$this->postDispatch('/panier/majtitrepanier/id_panier/15',
['new_libelle' => 'Mes livres'],
true);
+ Class_PanierNotice::clearCache();
}
- /** @test */
- public function panierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
- }
-
/** @test */
public function responseShouldRedirectToIndex() {
@@ -715,7 +699,7 @@ class PanierControllerModifierTitrePanierMesRomansToMesLivresTest extends Panier
/** @test */
public function panierLibelleShouldBeMesLivres() {
- $this->assertEquals('Mes livres', $this->panier_romans->getLibelle());
+ $this->assertEquals('Mes livres', Class_PanierNotice::find(15)->getLibelle());
}
}
@@ -731,12 +715,8 @@ class PanierControllerModifierCataloguePanierTest extends PanierControllerTestCa
$this->postDispatch('/panier/majtitrepanier/id_panier/15',
['domaine_ids' => '97-199'],
true);
- }
-
-
- /** @test */
- public function panierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
+ $this->panier_romans = Class_PanierNotice::find(15);
}
@@ -1041,34 +1021,15 @@ class PanierControllerCreerPanierPostTest extends PanierControllerTestCase {
parent::setUp();
$this->manon->setPaniers([]);
- $lesBonLivres= (new Class_PanierNotice);
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('save')
- ->answers(true)
- ->whenCalled('maxIdPanierForUser')
- ->answers(1)
- ->whenCalled('getId')
- ->answers(1)
- ->whenCalled('find')
- ->answers(((new Class_PanierNotice())
- ->setUser($this->manon)
- ->setLibelle('Par ici les bons livres')
- ->setIdPanier(1)));
-
-
$this->postDispatch('/panier/creer-panier',
['titre'=>'Par ici les bons livres']);
}
- /** @test */
- public function panierParIciLesBonsLivresShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
- }
-
/** @test */
public function validFormShouldCreatePanierWithLabelleParIciLesBonsLivres() {
- $this->assertEquals('Par ici les bons livres', Class_PanierNotice::find(1)->getLibelle());
+ $this->assertEquals('Par ici les bons livres',
+ Class_PanierNotice::findFirstBy(['order' => 'id desc'])->getLibelle());
}
}
@@ -1084,7 +1045,6 @@ class PanierControllerCreationPanierSuccessTest extends PanierControllerTestCase
$lesBonLivres= (new Class_PanierNotice);
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
->whenCalled('save')->answers(true)
- ->whenCalled('maxIdPanierForUser')->answers(1)
->whenCalled('getId')->answers(1)
->whenCalled('find')->answers((new Class_PanierNotice())
->setUser($this->manon)
@@ -1194,13 +1154,8 @@ class PanierControllerSupprimerNoticeBlacksadFromBDAndRedirectToRefererTest exte
/** @test */
public function afterDeletePanierShouldContainsOnlyCombatOrdinaire() {
- $this->assertEquals('COMBAT ORDINAIRE', $this->panier_bd->getNotices());
- }
-
-
- /** @test */
- public function afterDeletePanierShouldHaveBeenSaved() {
- $this->assertTrue(Class_PanierNotice::methodHasBeenCalled('save'));
+ Class_PanierNotice::clearCache();
+ $this->assertEquals('COMBAT ORDINAIRE', Class_PanierNotice::find(2)->getNotices());
}
@@ -1382,16 +1337,15 @@ class PanierControllerEditActionAsAbonneTest extends AbstractControllerTestCase
class PanierControllerEditActionAsAdminTest extends AbstractControllerTestCase {
+ protected
+ $_storm_default_to_volatile = true;
+
public function setup() {
parent::setup();
Class_Users::beVolatile();
Class_PanierNotice::beVolatile();
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('findAllWithCatalogue')
- ->answers([]);
-
$roger = Class_Users::newInstanceWithId(23, ['pseudo' => 'RogerL',
'nom' => 'plou',
'login' => 'man',
@@ -1432,17 +1386,12 @@ class PanierControllerEditActionAsAdminTest extends AbstractControllerTestCase {
class PanierControllerEditActionAsContributeurWithOutRightForAccessDomaineTest extends AbstractControllerTestCase {
+ protected
+ $_storm_default_to_volatile = true;
+
public function setup() {
parent::setup();
- Class_Users::beVolatile();
- Class_PanierNotice::beVolatile();
- Class_UserGroup::beVolatile();
-
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('findAllWithCatalogue')
- ->answers([]);
-
$roger = Class_Users::newInstanceWithId(23, ['pseudo' => 'RogerL',
'nom' => 'plou',
'login' => 'man',
diff --git a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
index 36620c78a3190c19d8c17f935eb6930b0304182e..55abf04364d8c6030072ace6e454929acc2a0015 100644
--- a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
+++ b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
@@ -87,7 +87,7 @@ abstract class ProfilOptionsControllerWithProfilAdulteTestCase extends AbstractC
'picto' => 'vide.gif',
'preferences' => [
'titre' => 'Nouvelles',
- 'nb_aff' => 0]],
+ 'nb_aff' => 2]],
['type_menu' => 'PROFIL',
@@ -363,28 +363,13 @@ class ProfilOptionsControllerProfilAdulteWithCacheTest extends ProfilOptionsCont
class ProfilOptionsControllerTwitterLinkWithProfilAdulteTest extends ProfilOptionsControllerWithProfilAdulteTestCase {
protected $_mock_web_client;
- public function setUp() {
- parent::setUp();
- $this->_mock_web_client = Storm_Test_ObjectWrapper::on(new Class_WebService_SimpleWebClient());
- ZendAfi_View_Helper_ShareUrl::setDefaultWebClient($this->_mock_web_client);
-
- $this->_mock_web_client
- ->whenCalled('open_url')
- ->answers('http://is.gd/PkdNgD');
-
- }
-
-
- public function tearDown() {
- ZendAfi_View_Helper_ShareUrl::resetDefaultWebClient();
- parent::tearDown();
- }
-
-
/** @test */
public function twitterLinkShouldReturnJavascriptForTweet() {
- $this->dispatch('/opac/index/share/on/twitter/titre/Profil+Adulte?url='.urlencode('http://localhost'.BASE_URL.'/index/index'), true);
- $this->assertContains("window.open('http://twitter.com/share?url=http%3A%2F%2Fis.gd%2FPkdNgD&text=Profil+Adulte&counturl=http%3A%2F%2Fis.gd%2FPkdNgD','_blank','toolbar=0,status=0,width=800, height=410');",
+ $url = 'http://localhost'.BASE_URL.'/index/index';
+ $this->dispatch('/opac/index/share/on/twitter/titre/Profil+Adulte?url=' . urlencode($url), true);
+
+ $expected_url = urlencode('http://localhost'.BASE_URL.'/index/index?id_profil=22');
+ $this->assertContains("window.open('http://twitter.com/share?url=" . $expected_url . "&text=Profil+Adulte&counturl=" . $expected_url . "','_blank','toolbar=0,status=0,width=800, height=410');",
$this->_response->getBody());
}
diff --git a/tests/application/modules/opac/controllers/RechercheControllerAlbum1DTouchTest.php b/tests/application/modules/opac/controllers/RechercheControllerAlbum1DTouchTest.php
index 8ffa9ef5c0ad7506119587d8fcd63660f9d24b53..e908af5683fa6d38fdf3b5ba86027a570bd4f810 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerAlbum1DTouchTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerAlbum1DTouchTest.php
@@ -66,6 +66,11 @@ class RechercheControllerAlbum1DTouchWithSSOTest
['id' => 'ONEDTOUCH_ID',
'clef' => 'ONEDTOUCH_ID',
'valeur' => 'my_bib']);
+
+ $this->fixture('Class_AdminVar',
+ ['id' => 'ONEDTOUCH_VERSION_URL',
+ 'clef' => 'ONEDTOUCH_VERSION_URL',
+ 'valeur' => Class_OneDTouchLink::OLD_VERSION]);
}
@@ -74,6 +79,32 @@ class RechercheControllerAlbum1DTouchWithSSOTest
$this->assertXPathContentContains('//a[@href="http://music.1dtouch.com/users/auth/my_bib?dest=albums/1"]',
'l\'album sur 1DTouch');
}
+
+}
+
+
+class RechercheControllerAlbum1DTouchWithSSOVersion2Test
+ extends RechercheControllerAlbum1DTouchTestCase {
+
+ protected function _prepareFixtures() {
+ $this->fixture('Class_AdminVar',
+ ['id' => 'ONEDTOUCH_ID',
+ 'clef' => 'ONEDTOUCH_ID',
+ 'valeur' => 'my_bib']);
+
+ $this->fixture('Class_AdminVar',
+ ['id' => 'ONEDTOUCH_VERSION_URL',
+ 'clef' => 'ONEDTOUCH_VERSION_URL',
+ 'valeur' => Class_OneDTouchLink::NEW_VERSION]);
+ }
+
+
+ /** @test */
+ public function externalUrlWithBibParamAsUrlShouldBeSSO() {
+
+ $this->assertXPathContentContains('//a[@href="http://music.1dtouch.com/users/auth/afi?bibid=my_bib&dest=albums/1"]',
+ 'l\'album sur 1DTouch',$this->_response->getBody());
+ }
}
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index 6ea3758e04eb2b0513211131fede827774521725..d217f1be291692a7d1ad94bc33268088d7b96950 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -137,41 +137,6 @@ class RechercheControllerPrintTest extends RechercheControllerNoticeTestCase {
-
-class RechercheControllerReseauTest extends RechercheControllerNoticeTestCase {
- public function setUp() {
- ZendAfi_View_Helper_ShareUrl::setDefaultWebClient(Storm_Test_ObjectWrapper::mock()
- ->whenCalled('open_url')
- ->answers(false));
- parent::setUp();
- $this->dispatch(sprintf('recherche/reseau/id_notice/%d/type_doc/1',
- $this->notice->getId()),
- true);
- }
-
-
- public function tearDown() {
- parent::tearDown();
- ZendAfi_View_Helper_ShareUrl::setDefaultWebClient(null);
- }
-
-
- /** @test */
- public function getResauShouldContainsTwitterGif() {
- $this->assertXPath('//img[contains(@src, "twitter.gif")]');
- }
-
-
- /** @test */
- public function getResauShouldContainsTwitterLink() {
- $this->assertContains("$.getScript('/social-network/share/id_notice/345/type_doc/1/on/twitter/url",
- $this->_response->getBody());
- }
-}
-
-
-
-
class RechercheControllerViewNoticeBabelthequeTest extends RechercheControllerNoticeTestCase {
/** @test */
public function withoutBabelthequeJSShouldNotBeLoaded() {
@@ -2316,7 +2281,7 @@ class RechercheControllerAjoutNoticePanierUrlWithMurConfigTest extends Recherche
/** @test **/
public function permalinkShouldBeDisplay() {
- $this->assertXPathContentContains('//span', "recherche/viewnotice/expressionRecherche/potter/facettes/T1/facette/B1/page/2/clef/PETITESSCENESDEBALCONTERRASSE-SUIVIDE100PLANTESPO---RUSTICA-2009-1/id/42225?id_profil=2",$this->_response->getBody());
+ $this->assertXPath('//img[contains(@class, "permalink")][contains(@data-url, "recherche/viewnotice/expressionRecherche/potter/facettes/T1/facette/B1/page/2/")]');
}
diff --git a/tests/application/modules/opac/controllers/SocialNetworkControllerTest.php b/tests/application/modules/opac/controllers/SocialNetworkControllerTest.php
index 554e4f372f0f119314c7c99d5ece853a8767b809..ed8dead0ad755d80ed7a2acf97f276f93a6f057b 100644
--- a/tests/application/modules/opac/controllers/SocialNetworkControllerTest.php
+++ b/tests/application/modules/opac/controllers/SocialNetworkControllerTest.php
@@ -21,37 +21,11 @@
require_once 'AbstractControllerTestCase.php';
class SocialNetworkControllerShareActionTest extends AbstractControllerTestCase {
- protected $_mock_web_client;
-
- public function setUp() {
- parent::setUp();
- $this->_mock_web_client = Storm_Test_ObjectWrapper::on(new Class_WebService_SimpleWebClient());
- ZendAfi_View_Helper_ShareUrl::setDefaultWebClient($this->_mock_web_client);
- }
-
-
- public function tearDown() {
- ZendAfi_View_Helper_ShareUrl::resetDefaultWebClient();
- parent::tearDown();
- }
-
-
- protected function _expectClientOpenUrlWithLongUrlAndAnswer($url, $answer) {
- $this->_mock_web_client
- ->whenCalled('open_url')
- ->with(sprintf('http://is.gd/api.php?longurl=%s', urlencode($url)))
- ->answers($answer)
- ->beStrict();
- }
-
-
/** @test */
public function shareOnTwitterShouldInjectShortUrlAndMessageAndCountUrl() {
- $this->_expectClientOpenUrlWithLongUrlAndAnswer('http://www.institut-francais.com',
- 'http://is.gd/PkdNgD');
$this->dispatch('/social-network/share/on/twitter/url/'.urlencode('http://www.institut-francais.com').'/titre/'.urlencode('Vive bucarest !').'/counturl/'.urlencode('http://www.institut-francais.com'), true);
- $this->assertEquals("window.open('http://twitter.com/share?url=http%3A%2F%2Fis.gd%2FPkdNgD&text=Vive+bucarest+%21&counturl=http%3A%2F%2Fis.gd%2FPkdNgD','_blank','toolbar=0,status=0,width=800, height=410');",
+ $this->assertEquals("window.open('http://twitter.com/share?url=http%3A%2F%2Fwww.institut-francais.com&text=Vive+bucarest+%21&counturl=http%3A%2F%2Fwww.institut-francais.com','_blank','toolbar=0,status=0,width=800, height=410');",
$this->_response->getBody());
}
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index daba6f5e2225a6628668aab1e3464c10a36eff24..4eca3ec9de04997a100369e6072357c3a1f5ce39 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -443,4 +443,26 @@ class UpgradeDB_286_Test extends UpgradeDBTestCase {
public function typeDocShouldExist() {
$this->assertColumn('notices_avis', 'type_doc');
}
+}
+
+
+
+class UpgradeDB_287_Test extends UpgradeDBTestCase {
+ public function prepare() {
+ try {
+ $this->query('ALTER TABLE bib_admin_users_non_valid DROP id_site, DROP idabon');
+ } catch(Exception $e) {}
+ }
+
+
+ /** @test */
+ public function idSiteShouldExists() {
+ $this->assertColumn('bib_admin_users_non_valid', 'id_site');
+ }
+
+
+ /** @test */
+ public function idabonShouldExists() {
+ $this->assertColumn('bib_admin_users_non_valid', 'idabon');
+ }
}
\ No newline at end of file
diff --git a/tests/library/Class/AvisNoticeTest.php b/tests/library/Class/AvisNoticeTest.php
index 392e64d903698cdce9b3edd233af9e5b45c18a57..3da89743ccca2597475d1430f093575091c6cfc2 100644
--- a/tests/library/Class/AvisNoticeTest.php
+++ b/tests/library/Class/AvisNoticeTest.php
@@ -603,14 +603,14 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
public function testDefaultSQLQuery() {
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
- "WHERE (flags=0) ORDER BY `DATE_AVIS` DESC");
+ "WHERE (flags=0) ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
public function testWithAllAndModoAPosteriori() {
$this->preferences['abon_ou_bib'] = 'all';
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
- "WHERE (flags=0) ORDER BY `DATE_AVIS` DESC");
+ "WHERE (flags=0) ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -620,7 +620,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
"WHERE (flags=0) AND ((STATUT=1 OR ABON_OU_BIB=1)) ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -630,7 +630,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
"WHERE (flags=0) AND ((STATUT=1 OR ABON_OU_BIB=0)) ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -644,7 +644,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
"FROM `notices_avis` ".
"WHERE (flags=0) AND ((STATUT=1 OR ABON_OU_BIB=1) ".
"AND (STATUT=1 OR ABON_OU_BIB=0)) ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -653,7 +653,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
"WHERE (flags=0) AND (ABON_OU_BIB='0') ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -665,7 +665,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
"FROM `notices_avis` ".
"WHERE (flags=0) AND (ABON_OU_BIB='0') ".
"AND ((STATUT=1 OR ABON_OU_BIB=1)) ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
@@ -674,7 +674,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
$this->assertQueryIs("SELECT `notices_avis`.* ".
"FROM `notices_avis` ".
"WHERE (flags=0) AND (ABON_OU_BIB='1') ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
public function testWithBiblioAndModoAPriori() {
@@ -685,7 +685,7 @@ class AvisLoaderGetAvisFromPreferencesTest extends AvisTestFindAllTestCase {
"FROM `notices_avis` ".
"WHERE (flags=0) AND (ABON_OU_BIB='1') ".
"AND ((STATUT=1 OR ABON_OU_BIB=0)) ".
- "ORDER BY `DATE_AVIS` DESC");
+ "ORDER BY `DATE_AVIS` DESC LIMIT 30");
}
}
@@ -865,6 +865,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
->with(['order' => 'DATE_AVIS DESC',
'clef_oeuvre' => ['POTTER'],
'flags' => '0',
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=1) AND (STATUT=1 OR ABON_OU_BIB=0)'])
->answers([$this->_avis_bib_moderated, $this->_avis_abon_moderated]);
@@ -882,6 +883,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
'clef_oeuvre' => ['POTTER'],
'ABON_OU_BIB' => 0,
'flags' => 0,
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=1) AND (STATUT=1 OR ABON_OU_BIB=0)'])
->answers([$this->_avis_abon_moderated]);
@@ -898,6 +900,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
'clef_oeuvre' => ['POTTER'],
'ABON_OU_BIB' => 1,
'flags' => 0,
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=1) AND (STATUT=1 OR ABON_OU_BIB=0)'])
->answers([$this->_avis_bib_moderated]);
@@ -916,6 +919,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
'clef_oeuvre' => ['POTTER'],
'ABON_OU_BIB' => 0,
'flags' => 0,
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=0)'])
->answers([$this->_avis_abon_moderated, $this->_avis_abon_not_moderated]);
@@ -934,6 +938,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
->with(['order' => 'DATE_AVIS DESC',
'clef_oeuvre' => ['POTTER'],
'flags' => 0,
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=0)'])
->answers([$this->_avis_bib_moderated, $this->_avis_abon_moderated, $this->_avis_abon_not_moderated]);
@@ -943,6 +948,26 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
}
+ /** @test */
+ public function withNbAffTwoAvisShouldLimitPageToSix() {
+ Class_AdminVar::newInstanceWithId('MODO_AVIS', ['valeur' => 0]);
+
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_AvisNotice')
+ ->whenCalled('findAllBy')
+ ->with(['order' => 'DATE_AVIS DESC',
+ 'clef_oeuvre' => ['POTTER'],
+ 'flags' => 0,
+ 'limitPage' => [1, 6],
+ 'where' => '(STATUT=1 OR ABON_OU_BIB=0)'])
+ ->answers([$this->_avis_bib_moderated, $this->_avis_abon_moderated, $this->_avis_abon_not_moderated]);
+
+ $this->assertEquals([$this->_avis_bib_moderated, $this->_avis_abon_moderated, $this->_avis_abon_not_moderated],
+ Class_AvisNotice::getAvisFromPreferences(['id_panier' => 1,
+ 'nb_aff_avis' => 2,
+ 'abon_ou_bib' => 'all']));
+ }
+
+
/** @test */
public function withAPosterioriBibModerationAllAvisShouldReturnModeratedRatingFromAbon() {
@@ -954,6 +979,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
->with(['order' => 'DATE_AVIS DESC',
'clef_oeuvre' => ['POTTER'],
'flags' => 0,
+ 'limitPage' => [1, 30],
'where' => '(STATUT=1 OR ABON_OU_BIB=1)'])
->answers([$this->_avis_bib_moderated, $this->_avis_bib_not_moderated, $this->_avis_abon_moderated]);
@@ -978,6 +1004,7 @@ class AvisNoticeAvisFromPreferencesTest extends Storm_Test_ModelTestCase {
->whenCalled('findAllBy')
->with(['order' => 'DATE_AVIS DESC',
'flags' => 0,
+ 'limitPage' => [1, 30],
'id_notice' => -1])
->answers([$this->_avis_bib_moderated, $this->_avis_bib_not_moderated, $this->_avis_abon_moderated]);
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
index e9557875b50f7b20270c61114f2b808f12d4faf9..d7b9cc1f40410ee8ce62f9402dbcad800feab99e 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
@@ -25,6 +25,7 @@ abstract class PhaseItemFacetsTestCase extends Class_Cosmogramme_Integration_Pha
parent::setUp();
$this->_phase = $this->_buildPhase('ItemFacets')
+ ->setMemoryCleaner(function() {})
->noDbReset()
->run();
}
@@ -87,7 +88,7 @@ class PhaseItemFacetsExpectedPreviousPhaseTest extends PhaseItemFacetsTestCase {
/** @test */
public function lastFacetsUpdateDateShouldBeSet() {
- $this->assertNotEquals('', Class_CosmoVar::getValueOf('date_maj_facettes'));
+ $this->assertNotEmpty(Class_CosmoVar::getValueOf('date_maj_facettes'));
}
}
@@ -111,4 +112,27 @@ abstract class PhaseItemFacetsCallbackTest extends PhaseItemFacetsTestCase {
['id' => 1,
'date_maj' => '2015-04-05 15:08:34'])]);
}
+}
+
+
+
+class PhaseItemFacetsExpectedExceptionPhaseTest extends PhaseItemFacetsTestCase {
+ protected function _getPreviousPhase() {
+ return (new Class_Cosmogramme_Integration_Phase(4))
+ ->beCron();
+ }
+
+
+ protected function _prepareFixtures() {
+ $this
+ ->onLoaderOfModel('Class_Notice')
+ ->whenCalled('findAllAfter')
+ ->answers('error');
+ }
+
+
+ /** @test */
+ public function logShouldContainsPhaseLabel() {
+ $this->assertLogContains('<h4>Mise à jour des facettes exemplaires</h4><span class="vert"> 0 records updated </span><p class="rouge">Erreur lors de l\'execution de la phase Mise à jour des facettes exemplaires : </br>Invalid argument supplied for foreach()</p>');
+ }
}
\ No newline at end of file
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
index 7095a3c7a522e35e6ca13893fe7b320e97a33da1..0c8fd99ce43e6676e2f89a8a0ce12f9b11be1819 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
@@ -28,7 +28,9 @@ class PhaseNoticeTestCase extends Class_Cosmogramme_Integration_PhaseTestCase {
$this->fixture('Class_CosmoVar',
['id' => 'unimarc_zone_matiere', 'valeur' => '610a']);
- $this->_phase = $this->_buildPhase('Notice')->run();
+ $this->_phase = $this->_buildPhase('Notice')
+ ->setMemoryCleaner(function() {})
+ ->run();
Class_Notice::clearCache();
Class_Exemplaire::clearCache();
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php b/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
index e60477f5be71db5377a1e7453d30e07c148008eb..443763cea4ed558d0b205725eb0d54f391d52acc 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
@@ -61,8 +61,9 @@ abstract class PhasePanierTestCase extends Class_Cosmogramme_Integration_PhaseTe
parent::setUp();
$this->_phase = $this->_buildPhase('Panier')
- ->setPrinter($this->_printer)
- ->run();
+ ->setMemoryCleaner(function() {})
+ ->setPrinter($this->_printer)
+ ->run();
}
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhasePatronsTest.php b/tests/library/Class/Cosmogramme/Integration/PhasePatronsTest.php
index cd123f5255169a8b53c38d23bcc25fa8f497db22..cdcd4dcbe7dce15ef6b83f757cd6cdad522e0162 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhasePatronsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhasePatronsTest.php
@@ -68,6 +68,7 @@ abstract class PhasePatronsTestCase extends Class_Cosmogramme_Integration_PhaseT
public function setUp() {
parent::setUp();
$this->_phase = $this->_buildPhase('Patrons')
+ ->setMemoryCleaner(function() {})
->setPrinter($this->_printer);
}
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
index 87e43bc6d98bb7a18365b4a2059203bc71207dc8..083363609a6f0a3cf21a38ac6a6ed89036b1bd6d 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
@@ -27,7 +27,8 @@ abstract class PhaseReservationTestCase extends Class_Cosmogramme_Integration_Ph
parent::setUp();
$this->_phase = $this->_buildPhase('Reservation')
- ->run();
+ ->setMemoryCleaner(function() {})
+ ->run();
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseReviewsTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseReviewsTest.php
index a5f97cd83d4407c8b0a289b39011b2eb744a03b2..3e38c9ecb4e09fa5183959ed8db976a35c9b0950 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseReviewsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseReviewsTest.php
@@ -25,6 +25,7 @@ abstract class PhaseReviewsTestCase extends Class_Cosmogramme_Integration_PhaseT
parent::setUp();
$this->_phase = $this->_buildPhase('Reviews')
+ ->setMemoryCleaner(function() {})
->noDbReset()
->run();
}
diff --git a/tests/library/Class/LocalisationTest.php b/tests/library/Class/LocalisationTest.php
index 261a037d12322a44e90be943fa87458183065585..ef9eabc9c23d3672d8d6cc66763464da9b81cbb6 100644
--- a/tests/library/Class/LocalisationTest.php
+++ b/tests/library/Class/LocalisationTest.php
@@ -87,6 +87,17 @@ class LocalisationTest extends Storm_Test_ModelTestCase {
'libelle' => 'CD Jazz',
'cote_debut' => 'CDJazz A',
'cote_fin' => 'CDJazz Z']);
+
+ $this->fixture('Class_Localisation',
+ ['id' => 22,
+ 'id_bib' => 1,
+ 'annexe' => 1,
+ 'section' => 'J',
+ 'genre' => 'B',
+ 'libelle' => 'CD Jazz Broken',
+ 'cote_debut' => 'CDJazz A',
+ 'cote_fin' => 'CDJazz Z',
+ 'type_doc' => 2]);
}
diff --git a/tests/library/Class/PanierNoticeTest.php b/tests/library/Class/PanierNoticeTest.php
index 4c12f0b26fb5190643bc2e1f5bc83ddd31ba659f..679ce6ca0e3bf8e599b596b077e3791db6d341a6 100644
--- a/tests/library/Class/PanierNoticeTest.php
+++ b/tests/library/Class/PanierNoticeTest.php
@@ -422,6 +422,10 @@ class PanierNoticeWithWrongUserIdTest extends AbstractControllerTestCase {
class PanierNoticeIndexAllTest extends ModelTestCase {
public function setUp() {
parent::setUp();
+
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Catalogue')
+ ->whenCalled('saveThesaurus')->answers(true);
+
$this->fixture('Class_Notice', ['id' => 4,
'titre_principal' => 'Le Montespan',
'auteur_principal' => 'Jean Teulﾃδｩ',
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/PanierTest.php b/tests/library/ZendAfi/View/Helper/Accueil/PanierTest.php
index 80529c25dc5210e146dc80eecb37a78b01c203b2..9add766864f3eeaad7ebb83849e0daf8eec0e902 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/PanierTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/PanierTest.php
@@ -16,15 +16,13 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-require_once 'library/ZendAfi/View/Helper/ViewHelperTestCase.php';
-
-
abstract class AbstractPanierHelperTest extends ViewHelperTestCase {
-
- protected $_tom;
+ protected
+ $_tom,
+ $_storm_default_to_volatile = true;
public function setup() {
parent:: setup();
@@ -33,12 +31,12 @@ abstract class AbstractPanierHelperTest extends ViewHelperTestCase {
ZendAfi_Auth::getInstance()->logUser($this->_tom);
- $this->_helper =
- new ZendAfi_View_Helper_Accueil_Panier(5,
+ $this->_helper =
+ new ZendAfi_View_Helper_Accueil_Panier(5,
['type_module' => 'PANIER',
'division' => '1',
'preferences' => ['titre' => 'Panier']] );
-
+
$this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
}
@@ -46,7 +44,7 @@ abstract class AbstractPanierHelperTest extends ViewHelperTestCase {
-class PanierTestWithConnectedUser extends AbstractPanierHelperTest {
+class PanierTestWithConnectedUser extends AbstractPanierHelperTest {
public function setUp() {
parent::setUp();
$this->_html = $this->_helper->getBoite();
@@ -68,39 +66,53 @@ class PanierTestWithConnectedUser extends AbstractPanierHelperTest {
-class PanierTestWithConnectedUserPanierNoticesFromUserAndNoCurrentPanier extends AbstractPanierHelperTest {
+
+abstract class PanierTestWithConnectedUserTestCase extends AbstractPanierHelperTest {
public function setUp() {
parent::setUp();
- $cuisiner_la_pomme =
- Class_Notice::newInstanceWithId(18,
- ['titre_principal' => 'Cuisiner la pomme',
- 'clef_alpha' => 'cuisiner la pomme']);
- $cuisiner_la_poire =
- Class_Notice::newInstanceWithId(19,
- ['titre_principal' => 'Cuisiner la poire',
- 'clef_alpha' => 'cuisiner la poire']);
+ $cuisiner_la_pomme = $this->fixture('Class_Notice',
+ ['id' => 18,
+ 'titre_principal' => 'Cuisiner la pomme',
+ 'auteur_principal' => 'Tom Apple',
+ 'clef_alpha' => 'CUISINER-LA-POMME']);
+
+ $cuisiner_la_poire = $this->fixture('Class_Notice',
+ ['id' => 19,
+ 'titre_principal' => 'Cuisiner la poire',
+ 'auteur_principal' => 'Tom Pear',
+ 'clef_alpha' => 'CUISINER-LA-POIRE']);
+
+ $panier_cuisine = $this->fixture('Class_PanierNotice',
+ ['id' => 987,
+ 'libelle' => 'Panier cuisine']);
+ $panier_cuisine
+ ->addNotice($cuisiner_la_pomme)
+ ->addNotice($cuisiner_la_poire)
+ ->assertSave();
- $panier_cuisine =
- Class_PanierNotice::newInstanceWithId(987, ['libelle' => 'Panier cuisine'])
- ->setNotices([$cuisiner_la_pomme, $cuisiner_la_poire]);
+ $catalogue_adultes = $this->fixture('Class_Catalogue',
+ ['id' => 6,
+ 'libelle' => 'Adultes']);
- $catalogue_adultes = Class_Catalogue::newInstanceWithId(6,['libelle' => 'Adultes']);
+ $panier_romans = $this->fixture('Class_PanierNotice',
+ ['id' => 666,
+ 'libelle' => 'Romans',
+ 'catalogues' => [$catalogue_adultes]]);
+ }
+}
- $panier_romans = Class_PanierNotice::newInstanceWithId(666, ['libelle' => 'Romans',
- 'catalogues' => [$catalogue_adultes]]);
- $this->_tom->setPaniers([$panier_cuisine]);
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
- ->whenCalled('findAllWithCatalogue')
- ->answers([$panier_romans]);
+class PanierTestWithConnectedUserPanierNoticesFromUserAndNoCurrentPanier extends PanierTestWithConnectedUserTestCase {
+ public function setUp() {
+ parent::setUp();
$this->_html = $this->_helper->getBoite();
}
-
+
/** @test **/
public function actionBarShouldNotContainsShareAction() {
$this->assertNotXPath($this->_html, '//div[@class="panier-action-bar"]/ul/li//input[contains(@value,"recherche/simple/")]');
@@ -116,54 +128,31 @@ class PanierTestWithConnectedUserPanierNoticesFromUserAndNoCurrentPanier extends
-class PanierTestWithConnectedUserAndCurrentPanierWithNotice extends AbstractPanierHelperTest {
+class PanierTestWithConnectedUserAndCurrentPanierWithNotice extends PanierTestWithConnectedUserTestCase {
public function setUp() {
parent::setUp();
- $cuisiner_la_pomme =
- Class_Notice::newInstanceWithId(18,
- ['titre_principal' => 'Cuisiner la pomme',
- 'auteur_principal' => 'Tom Apple',
- 'clef_alpha' => 'CUISINER-LA-POMME']);
- $cuisiner_la_poire =
- Class_Notice::newInstanceWithId(19,
- ['titre_principal' => 'Cuisiner la poire',
- 'auteur_principal' => 'Tom Pear',
- 'clef_alpha' => 'CUISINER-LA-POIRE']);
-
- $panier_cuisine =
- Class_PanierNotice::newInstanceWithId(987, ['libelle' => 'Panier cuisine'])
- ->addNotice($cuisiner_la_pomme)
- ->addNotice($cuisiner_la_poire);
-
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Notice')
- ->whenCalled('findAllBy')
- ->answers([$cuisiner_la_pomme, $cuisiner_la_poire]);
-
- $this->_tom
- ->setPaniers([$panier_cuisine])
- ->setPanierCourant($panier_cuisine);
+ $this->_tom->setPanierCourant(Class_PanierNotice::find(987));
$this->_html = $this->_helper->getBoite();
}
-
+
/** @test **/
public function boitePanierShouldDisplayPanierCuisinerLaPomme() {
- $this->assertXPathContentContains($this->_html, '//tbody/tr[1]', 'Cuisiner la pomme', $this->_html);
+ $this->assertXPathContentContains($this->_html, '//tbody/tr[2]', 'Cuisiner la pomme', $this->_html);
}
-
+
/** @test **/
public function boitePanierShouldDisplayPanierCuisinerLaPommeByTomApple() {
- $this->assertXPathContentContains($this->_html, '//tbody/tr[1]', 'Tom Apple', $this->_html);
+ $this->assertXPathContentContains($this->_html, '//tbody/tr[2]', 'Tom Apple', $this->_html);
}
-
/** @test **/
public function boitePanierShouldDisplayPanierCuisinerLaPoire() {
- $this->assertXPathContentContains($this->_html, '//tbody/tr[2]', 'Cuisiner la poire', $this->_html);
+ $this->assertXPathContentContains($this->_html, '//tbody/tr[1]', 'Cuisiner la poire', $this->_html);
}
@@ -177,7 +166,7 @@ class PanierTestWithConnectedUserAndCurrentPanierWithNotice extends AbstractPani
public function rowShouldContainsDelAction() {
$this->assertXPath($this->_html, '//tbody/tr//a[contains(@href,"/paniersupprimernotice/id_panier/987/id_notice/18/redirect/referer")]');
}
-
+
/** @test **/
public function actionBarShouldContainsAfficherAsResultatDeRechercheAction() {
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php b/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
index 3b6b3c4fa86444671353d28a0798d60619e7507c..e67a637000846b1df9cc459c670dc52b179d2aa1 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
@@ -71,7 +71,7 @@ class ZendAfi_View_Helper_Accueil_RechSimpleWithAdminTest extends ZendAfi_View_H
/** @test */
public function deleteBlockActionShouldBePresent() {
- $this->assertLocalXPath('//a[contains(@href, "/admin/accueil/delete-block/id_module/1/division/1")]');
+ $this->assertLocalXPath('//a[contains(@href, "/admin/accueil/delete-block/id_module/1/division/1")][contains(@onclick, "return confirm(")]');
}
}
diff --git a/tests/library/ZendAfi/View/Helper/Notice/FacettesTypeDocTest.php b/tests/library/ZendAfi/View/Helper/Notice/FacettesTypeDocTest.php
index 4383f1fea08caf4701d4c15ccd0cdf8dc5b8ba2a..cf14bfb1c8867a1afe3575cbb8f14153ee171f17 100644
--- a/tests/library/ZendAfi/View/Helper/Notice/FacettesTypeDocTest.php
+++ b/tests/library/ZendAfi/View/Helper/Notice/FacettesTypeDocTest.php
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class ZendAfi_View_Helper_Notice_FacettesTypeDocTest extends ViewHelperTestCase {
@@ -26,29 +26,22 @@ class ZendAfi_View_Helper_Notice_FacettesTypeDocTest extends ViewHelperTestCase
parent::setUp();
$this->_helper = new ZendAfi_View_Helper_Notice_FacettesTypeDoc();
$this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
- $this->_html = $this->_helper->notice_FacettesTypeDoc(['T' => [ 'titre' => 'Type de document',
- 1 => ['id' => 'T1',
- 'libelle' => 'Livres',
- 'nombre' => 22],
- 2 => ['id' => 'T3',
- 'libelle' => 'DVD',
- 'nombre' => 34]]]);
+ $this->_html = $this->_helper->notice_FacettesTypeDoc(['T' => ['T1' => 22,
+ 'T3' => 34]]);
}
/** @test */
public function linkForTypeDocLivreShouldContains22() {
$this->assertXPathContentContains($this->_html,
- '//div[@class="facettes_type_doc"]//a[@class="type_doc_1"][contains(@href, "facette/T1")]',
- '22');
+ '//div[@class="facettes_type_doc"]//a[@class="type_doc_1"][contains(@href, "facette/T1")]', '22');
}
/** @test */
public function linkForTypeDVDShouldContains34() {
$this->assertXPathContentContains($this->_html,
- '//div[@class="facettes_type_doc"]//a[@class="type_doc_3"][contains(@href, "facette/T3")]',
- '34');
+ '//div[@class="facettes_type_doc"]//a[@class="type_doc_3"][contains(@href, "facette/T3")]', '34');
}
}
?>
\ No newline at end of file
diff --git a/tests/library/ZendAfi/View/Helper/ShareUrlTest.php b/tests/library/ZendAfi/View/Helper/ShareUrlTest.php
deleted file mode 100644
index e5376d191ce91aa445188e737d15154b550f9080..0000000000000000000000000000000000000000
--- a/tests/library/ZendAfi/View/Helper/ShareUrlTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
- *
- * BOKEH is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation.
- *
- * There are special exceptions to the terms and conditions of the AGPL as it
- * is applied to this software (see README file).
- *
- * BOKEH is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-require_once 'ViewHelperTestCase.php';
-
-class ZendAfi_View_Helper_ShareUrlTest extends ViewHelperTestCase {
- public function setUp() {
- parent::setUp();
- $this->_mock_web_client = Storm_Test_ObjectWrapper::on(new Class_WebService_SimpleWebClient());
- ZendAfi_View_Helper_ShareUrl::setDefaultWebClient($this->_mock_web_client);
-
- $this->_helper = new ZendAfi_View_Helper_ShareUrl();
- $this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
- }
-
- public function tearDown() {
- ZendAfi_View_Helper_ShareUrl::resetDefaultWebClient();
- parent::tearDown();
- }
-
-
- /** @test */
- public function shortenUrlShouldReturnIsGdUrl() {
- $this->_expectClientOpenUrlWithLongUrlAndAnswer('http://www.institut-francais.com',
- 'http://is.gd/PkdNgD');
-
- $this->assertEquals('http://is.gd/PkdNgD',
- $this->_helper->shortenUrl('http://www.institut-francais.com'));
- }
-
-
- /** @test */
- public function getTwitterUrlViewNoticeShouldReturnShortenUrlWithServerHost() {
- $_SERVER["HTTP_HOST"] = 'localhost';
- $this->_expectClientOpenUrlForShortenViewNotice2();
- $this->assertEquals("http://twitter.com/share?url=http%3A%2F%2Fis.gd%2FPkdNg2&text=&counturl=http%3A%2F%2Fis.gd%2FPkdNg2",
- $this->_helper->shareUrl("twitter", '/recherche/viewnotice/id/2'));
- }
-
-
- /** @test */
- public function getTwitterUrlViewNoticeWithMessageShouldReturnShortenUrlWithServerHost() {
- $_SERVER["HTTP_HOST"] = 'localhost';
- $this->_expectClientOpenUrlForShortenViewNotice2();
- $this->assertEquals("http://twitter.com/share?url=http%3A%2F%2Fis.gd%2FPkdNg2&text=venez+voir+%21&counturl=http%3A%2F%2Fis.gd%2FPkdNg2",
- $this->_helper->shareUrl("twitter", '/recherche/viewnotice/id/2', 'venez voir !'));
- }
-
-
- /** @test */
- public function shortenUrlWithErrorShouldReturnOriginalUrl() {
- $this->_expectClientOpenUrlWithLongUrlAndAnswer('http://www.institut-francais.com',
- 'Error');
-
- $this->assertEquals('http://www.institut-francais.com',
- $this->_helper->shortenUrl('http://www.institut-francais.com'));
- }
-
-
- /** @test */
- public function shortenUrlWithNullShouldReturnOriginalUrl() {
- $this->_expectClientOpenUrlWithLongUrlAndAnswer('http://www.institut-francais.com',
- null);
-
- $this->assertEquals('http://www.institut-francais.com',
- $this->_helper->shortenUrl('http://www.institut-francais.com'));
- }
-
-
- protected function _expectClientOpenUrlWithLongUrlAndAnswer($url, $answer) {
- $this->_mock_web_client
- ->whenCalled('open_url')
- ->with('http://is.gd/api.php?longurl=http%3A%2F%2Flocalhost%2Frecherche%2Fviewnotice%2Fid%2F2')
- ->answers($answer)
-
- ->whenCalled('open_url')
- ->with(sprintf('http://is.gd/api.php?longurl=%s', urlencode($url)))
- ->answers($answer)
- ->beStrict();
-
- }
-
-
- protected function _expectClientOpenUrlForShortenViewNotice2() {
- $this->_expectClientOpenUrlWithLongUrlAndAnswer('http://localhost'. BASE_URL .'/recherche/viewnotice/id/2',
- 'http://is.gd/PkdNg2');
- }
-}
-
-
-?>
\ No newline at end of file