| 102,9 → 102,9 |
|---|
| $obsAAjouter['user_pseudo'] = $this->userIntitule; |
| |
| $obsAAjouter['user_sci_name'] = isset($obs['nom_sel']) ? $obs['nom_sel'] : null; |
| $obsAAjouter['user_sci_name_id'] = isset($obs['num_nom_sel']) ? $obs['num_nom_sel'] : null; |
| $obsAAjouter['user_sci_name_id'] = isset($obs['num_nom_sel']) && '' !== $obs['num_nom_sel'] ? $obs['num_nom_sel'] : null; |
| $obsAAjouter['accepted_sci_name'] = isset($obs['nom_ret']) ? $obs['nom_ret'] : null; |
| $obsAAjouter['accepted_sci_name_id'] = isset($obs['num_nom_ret']) ? $obs['num_nom_ret'] : null; |
| $obsAAjouter['accepted_sci_name_id'] = isset($obs['num_nom_ret']) && '' !== $obs['num_nom_ret'] ? $obs['num_nom_ret'] : null; |
| $obsAAjouter['family'] = isset($obs['famille']) ? $obs['famille'] : null; |
| $obsAAjouter['taxo_repo'] = isset($obs['referentiel']) ? ($obs['referentiel'] == 'bdtfxr') ? 'bdtfx' : $obs['referentiel'] : null; |
| |
| Property changes: |
|---|
| Added: svn:mergeinfo |
|---|
| Merged /branches/v2.10-motoculteur/jrest/services/CelWidgetSaisie.php:r2655-2661 |
|---|
| Merged /branches/v2.24-sarcloir/jrest/services/CelWidgetSaisie.php:r2825,2827,2829 |
|---|
| Merged /branches/v2.2-faucille/jrest/services/CelWidgetSaisie.php:r2185-2186,2188,2197-2198 |
|---|
| Merged /branches/v2.6-greffoir/jrest/CelWidgetSaisie.php:r2396-2397 |
|---|
| Merged /branches/v2.8-houe/jrest/services/CelWidgetSaisie.php:r2477-2485,2489,2495,2502-2503 |
|---|
| Merged /branches/v2.6-greffoir/jrest/services/CelWidgetSaisie.php:r2355-2384,2396-2397,2399 |
|---|
| Merged /branches/v1.7-croissant/jrest/services/CelWidgetSaisie.php:r1855,1879-1880,1885-1886,1917,1923,1983 |
|---|
| Merged /branches/v2.25-scarificateur/jrest/services/CelWidgetSaisie.php:r3001 |
|---|
| Merged /trunk/jrest/services/CelWidgetSaisie.php:r3715-3719 |
|---|
| Merged /branches/v2.0-elagueuse/jrest/services/CelWidgetSaisie.php:r2113-2114 |
|---|
| Merged /branches/v2.4-fourche/jrest/services/CelWidgetSaisie.php:r2295,2310-2311,2313,2316 |
|---|
| Merged /branches/topic-dbsingleton/jrest/services/CelWidgetSaisie.php:r1720-1764 |
|---|
| Merged /branches/v1.8-debroussailleuse/jrest/services/CelWidgetSaisie.php:r1981,1987,1992 |
|---|
| Merged /branches/v2.23-rouleau/jrest/services/CelWidgetSaisie.php:r2777 |
|---|
| Merged /branches/v2.6-greffoir/services/CelWidgetSaisie.php:r2396-2397 |
|---|