Skip to content
Snippets Groups Projects
Commit d76cff6e authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'hotline#65557_bizarreries_abonne' into 'stable'

hotline #65557: fix title in loan list

See merge request !2377
parents 96e03eda 8c7cd4f0
Branches
Tags
3 merge requests!2382Hotline master,!2381Stable,!2377hotline #65557: fix title in loan list
Pipeline #2758 passed with stage
in 22 minutes and 32 seconds
- ticket #65557 : compte abonne : correctif sur l'affichage des titres dans la liste des prets
\ No newline at end of file
......@@ -16,17 +16,17 @@
*
* 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_Abonne_Abonnement extends ZendAfi_View_Helper_Abonne_Abstract {
public function abonne_abonnement($user) {
$date_fin=formatDate($user->getDateFin(),"1");
if (!$user->isAbonne() || !$date_fin)
if (!$user->isAbonne() || !$date_fin)
return '';
$html = $user->isAbonnementValid()
$html = $user->isAbonnementValid()
? $this->tagFicheAbonne($this->view->_("Votre abonnement est valide jusqu'au %s.", $date_fin))
: $this->tagFicheAbonne($this->view->_("Votre abonnement est terminé depuis le %s.", $date_fin));
......
......@@ -39,7 +39,7 @@ class ZendAfi_View_Helper_Abonne_Operation extends ZendAfi_View_Helper_BaseHelpe
protected function _renderTitle($operation, $attribs = []) {
if($this->_isStormLimited())
return $operation->getAuteur();
return $operation->getTitre();
$record = $this->_getRecord($operation);
return ($record->getId())
......
......@@ -1038,6 +1038,12 @@ class AbonneControllerPretsListMoreThanUndredLoansTest extends AbonneControllerP
}
/** @test */
public function titleShouldNotBeInAnchor() {
$this->assertXPath('//tbody/tr[1]//td[contains(text(),"Harry Potter")]');
}
/** @test */
public function tooManyHoldsMessageShouldBePresent() {
$this->assertXPathContentContains('//p[@class="error"]', 'L\'enrichissement des documents');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment