Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/afi/dev#17649_webservice_update_availability' into afi-master Conflicts: library/Class/CommSigb.php library/ZendAfi/View/Helper/Notice/ReservationLink.php library/storm tests/library/Class/CommSigbTest.php tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php
Showing
- VERSIONS_WIP/dev_13769_cache_doc_availability 1 addition, 1 deletionVERSIONS_WIP/dev_13769_cache_doc_availability
- VERSIONS_WIP/dev_17649_webservice_update_availability 1 addition, 0 deletionsVERSIONS_WIP/dev_17649_webservice_update_availability
- application/modules/opac/controllers/NoticeajaxController.php 47 additions, 45 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- library/Class/Bib.php 3 additions, 1 deletionlibrary/Class/Bib.php
- library/Class/CommSigb.php 15 additions, 20 deletionslibrary/Class/CommSigb.php
- library/Class/Exemplaire.php 16 additions, 0 deletionslibrary/Class/Exemplaire.php
- library/Class/Notice.php 2 additions, 1 deletionlibrary/Class/Notice.php
- library/ZendAfi/View/Helper/Notice/Exemplaires.php 347 additions, 128 deletionslibrary/ZendAfi/View/Helper/Notice/Exemplaires.php
- library/ZendAfi/View/Helper/Notice/ReservationLink.php 3 additions, 3 deletionslibrary/ZendAfi/View/Helper/Notice/ReservationLink.php
- library/storm 1 addition, 1 deletionlibrary/storm
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 188 additions, 51 deletions...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/library/Class/CommSigbTest.php 167 additions, 97 deletionstests/library/Class/CommSigbTest.php
- tests/library/Class/UserGroupTest.php 2 additions, 0 deletionstests/library/Class/UserGroupTest.php
- tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php 66 additions, 32 deletionstests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php
Please register or sign in to comment