Merge branch 'dev_15640_customfields_for_trainings'
Conflicts: VERSIONS
Showing
- VERSIONS 4 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/FormationController.php 32 additions, 397 deletions...ication/modules/admin/controllers/FormationController.php
- application/modules/admin/controllers/SessionFormationController.php 376 additions, 0 deletions.../modules/admin/controllers/SessionFormationController.php
- application/modules/admin/views/scripts/formation/_formation.phtml 7 additions, 6 deletions...on/modules/admin/views/scripts/formation/_formation.phtml
- application/modules/admin/views/scripts/formation/_session.phtml 23 additions, 17 deletions...tion/modules/admin/views/scripts/formation/_session.phtml
- application/modules/admin/views/scripts/formation/add.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/formation/add.phtml
- application/modules/admin/views/scripts/formation/edit.phtml 5 additions, 0 deletionsapplication/modules/admin/views/scripts/formation/edit.phtml
- application/modules/admin/views/scripts/session-formation/add.phtml 5 additions, 0 deletions...n/modules/admin/views/scripts/session-formation/add.phtml
- application/modules/admin/views/scripts/session-formation/edit.phtml 5 additions, 0 deletions.../modules/admin/views/scripts/session-formation/edit.phtml
- application/modules/admin/views/scripts/session-formation/impressions.phtml 9 additions, 5 deletions...s/admin/views/scripts/session-formation/impressions.phtml
- application/modules/admin/views/scripts/session-formation/inscriptions.phtml 0 additions, 0 deletions.../admin/views/scripts/session-formation/inscriptions.phtml
- library/Class/CustomField/ModelValues.php 6 additions, 4 deletionslibrary/Class/CustomField/ModelValues.php
- library/Class/SessionFormation.php 34 additions, 6 deletionslibrary/Class/SessionFormation.php
- library/Class/UserGroup.php 17 additions, 16 deletionslibrary/Class/UserGroup.php
- library/Class/Users.php 2 additions, 7 deletionslibrary/Class/Users.php
- library/ZendAfi/Controller/Action.php 31 additions, 17 deletionslibrary/ZendAfi/Controller/Action.php
- library/ZendAfi/Controller/Action/RessourceDefinitions.php 13 additions, 8 deletionslibrary/ZendAfi/Controller/Action/RessourceDefinitions.php
- library/ZendAfi/Form/Admin/Formation.php 44 additions, 0 deletionslibrary/ZendAfi/Form/Admin/Formation.php
- library/ZendAfi/Form/Admin/SessionFormation.php 119 additions, 0 deletionslibrary/ZendAfi/Form/Admin/SessionFormation.php
- library/ZendAfi/View/Helper/Admin/UserGroupMemberShip.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Admin/UserGroupMemberShip.php
Please register or sign in to comment