Merge branch 'hotline#26584-broken-avis-import' into 'stable' (17802c69) · 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
17802c69

Commit 17802c69 authored 9 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline#26584-broken-avis-import' into 'stable'

Hotline#26584 broken avis import

See merge request !969

parents 81384307 0702838e

Branches

Tags

3 merge requests!976Master,!975Hotline master,!974Stable

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_STABLE/26584 1 addition, 0 deletions

VERSIONS_STABLE/26584
application/modules/admin/controllers/SystemeController.php 136 additions, 138 deletions

application/modules/admin/controllers/SystemeController.php
application/modules/admin/views/scripts/systeme/importavisopac2.phtml 41 additions, 111 deletions

...modules/admin/views/scripts/systeme/importavisopac2.phtml
library/Class/AvisNotice.php 27 additions, 12 deletions

library/Class/AvisNotice.php
library/Class/Import/Opac2.php 162 additions, 0 deletions

library/Class/Import/Opac2.php
tests/application/modules/admin/controllers/SystemeControllerOpac2ImportTest.php 420 additions, 0 deletions

...es/admin/controllers/SystemeControllerOpac2ImportTest.php
tests/application/modules/admin/controllers/SystemeControllerTest.php 13 additions, 18 deletions

...ation/modules/admin/controllers/SystemeControllerTest.php

with 800 additions and 279 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