This is an automated email from the git hooks/post-receive script. New change to branch feature/8085_univers-disjoint in repository tutti. See http://git.codelutin.com/tutti.git discards 23600c1 on enlève de l'univers des maturités les psfm sélectionnés dans les autres onglets, et on vice versa (fixes #8085) adds 5d0b271 on vérifie que la strate est dans les strates disponibles avant d'essayer de la retirer et de retirer ses fils. Si elle n'y est pas (ce qui arrive au lancement de l'ecran) alors on la retire pas (fixes #8055) adds 0465652 Use method reference adds 7feb110 Remove unused code adds 8dadcbf Fixes #8055 Merge branch 'feature/8055' into develop adds 182a195 espèces du protocole : remplacement du du pmfm de type de pieces calcifiées par une caracteristicvalue. On propose donc les valeurs qualitative du psfm de type de piece calcifiée. Comme il n'existe pas, j'ai pris au hasard le psfm d'id 6, il faudra le modifier quand on aura la psfm (fixes #8087) adds 155ec4e Fixes #8087 Merge branch 'feature/8087' into develop adds 5d99913 on enlève de l'univers des maturités les psfm sélectionnés dans les autres onglets, et on vice versa (fixes #8085) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (23600c1) \ N -- N -- N refs/heads/feature/8085_univers-disjoint (5d99913) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 ++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62423 -> 62463 bytes .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 +++++ .../protocol/EditProtocolSpeciesRowModel.java | 28 ++++------ .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 59 ++++++++++++--------- .../content/protocol/EditProtocolUIModel.java | 16 +++--- .../protocol/zones/ZoneEditorUIHandler.java | 30 ++++++----- 13 files changed, 113 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.