Merge branch 'hotline#36466_fix_item_insitu_localisation' into 'stable' (4b92563b) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
opacce
Commits
4b92563b

Commit 4b92563b authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#36466_fix_item_insitu_localisation' into 'stable'

Hotline#36466 fix item insitu localisation

See merge request !1415

parents 694e2956 db15f822

Branches

Tags

7 merge requests!1553Master,!1502Master,!1501Stable,!1472Stable,!1428Master,!1427Hotline master,!1426Stable

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/36466 1 addition, 0 deletions

VERSIONS_HOTLINE/36466
application/modules/opac/controllers/NoticeajaxController.php 2 additions, 12 deletions

...ication/modules/opac/controllers/NoticeajaxController.php
library/Class/Localisation.php 66 additions, 32 deletions

library/Class/Localisation.php
library/ZendAfi/View/Helper/Notice/ExemplairesTable.php 12 additions, 2 deletions

library/ZendAfi/View/Helper/Notice/ExemplairesTable.php
public/opac/js/recherche.js 2 additions, 2 deletions

public/opac/js/recherche.js
tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 26 additions, 19 deletions

...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
tests/library/Class/LocalisationTest.php 36 additions, 41 deletions

tests/library/Class/LocalisationTest.php

with 145 additions and 108 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment