[opendebitdeboisson-commits] r384 - in branches/poc-upgrade-om-4.10: . gen/obj

[gmal...@adullact.net]

Author: gmalvolti
Date: 2019-08-01 11:37:52 +0200 (Thu, 01 Aug 2019)
New Revision: 384

Modified:
branches/poc-upgrade-om-4.10/
branches/poc-upgrade-om-4.10/EXTERNALS.txt
branches/poc-upgrade-om-4.10/gen/obj/om_logo.class.php
branches/poc-upgrade-om-4.10/gen/obj/om_sig_map.class.php
Log:
* Mise ?\195?\160 jour du framework openmairie sur la branche 4.10.0-develop et reg?\195?\169n?\195?\169ration suite au ticket #9267 du framework.


Index: branches/poc-upgrade-om-4.10
===================================================================
--- branches/poc-upgrade-om-4.10 2019-08-01 09:31:16 UTC (rev 383)
+++ branches/poc-upgrade-om-4.10 2019-08-01 09:37:52 UTC (rev 384)

Property changes on: branches/poc-upgrade-om-4.10
___________________________________________________________________
Modified: svn:externals
## -3,6 +3,6 ##
#

# framework openmairie
-core https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/core
-lib https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/lib
-php https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/php
+core svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/core
+lib svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
+php svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/php
Modified: branches/poc-upgrade-om-4.10/EXTERNALS.txt
===================================================================
--- branches/poc-upgrade-om-4.10/EXTERNALS.txt 2019-08-01 09:31:16 UTC (rev 383)
+++ branches/poc-upgrade-om-4.10/EXTERNALS.txt 2019-08-01 09:37:52 UTC (rev 384)
@@ -3,6 +3,6 @@
#

# framework openmairie
-core https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/core
-lib https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/lib
-php https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/tags/4.9.0/php
+core svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/core
+lib svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
+php svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/php

Modified: branches/poc-upgrade-om-4.10/gen/obj/om_logo.class.php
===================================================================
--- branches/poc-upgrade-om-4.10/gen/obj/om_logo.class.php 2019-08-01 09:31:16 UTC (rev 383)
+++ branches/poc-upgrade-om-4.10/gen/obj/om_logo.class.php 2019-08-01 09:37:52 UTC (rev 384)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 07/08/2018 10:12
+//gen openMairie le 01/08/2019 11:34

require_once "../obj/om_dbform.class.php";

@@ -22,6 +22,9 @@
var $foreign_keys_extended = array(
"om_collectivite" => array("om_collectivite", ),
);
+ var $abstract_type = array(
+ "fichier" => "file",
+ );

/**
*
@@ -136,7 +139,11 @@
$form->setType("id", "text");
$form->setType("libelle", "text");
$form->setType("description", "text");
- $form->setType("fichier", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
$form->setType("resolution", "text");
$form->setType("actif", "checkbox");
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
@@ -160,7 +167,11 @@
$form->setType("id", "text");
$form->setType("libelle", "text");
$form->setType("description", "text");
- $form->setType("fichier", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
$form->setType("resolution", "text");
$form->setType("actif", "checkbox");
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
@@ -184,7 +195,7 @@
$form->setType("id", "hiddenstatic");
$form->setType("libelle", "hiddenstatic");
$form->setType("description", "hiddenstatic");
- $form->setType("fichier", "hiddenstatic");
+ $form->setType("fichier", "filestatic");
$form->setType("resolution", "hiddenstatic");
$form->setType("actif", "hiddenstatic");
if ($_SESSION["niveau"] == 2) {
@@ -200,7 +211,7 @@
$form->setType("id", "static");
$form->setType("libelle", "static");
$form->setType("description", "static");
- $form->setType("fichier", "static");
+ $form->setType("fichier", "file");
$form->setType("resolution", "static");
$form->setType("actif", "checkboxstatic");
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {

Modified: branches/poc-upgrade-om-4.10/gen/obj/om_sig_map.class.php
===================================================================
--- branches/poc-upgrade-om-4.10/gen/obj/om_sig_map.class.php 2019-08-01 09:31:16 UTC (rev 383)
+++ branches/poc-upgrade-om-4.10/gen/obj/om_sig_map.class.php 2019-08-01 09:37:52 UTC (rev 384)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 07/08/2018 10:12
+//gen openMairie le 01/08/2019 11:34

require_once "../obj/om_dbform.class.php";

@@ -30,6 +30,10 @@
"om_sig_extent" => array("om_sig_extent", ),
"om_sig_map" => array("om_sig_map", ),
);
+ var $abstract_type = array(
+ "sld_marqueur" => "file",
+ "sld_data" => "file",
+ );

/**
*
@@ -289,8 +293,16 @@
$form->setType("om_sig_extent", "select");
}
$form->setType("restrict_extent", "checkbox");
- $form->setType("sld_marqueur", "text");
- $form->setType("sld_data", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("sld_marqueur", "upload");
+ } else {
+ $form->setType("sld_marqueur", "upload2");
+ }
+ if ($this->retourformulaire == "") {
+ $form->setType("sld_data", "upload");
+ } else {
+ $form->setType("sld_data", "upload2");
+ }
$form->setType("point_centrage", "geom");
}

@@ -337,8 +349,16 @@
$form->setType("om_sig_extent", "select");
}
$form->setType("restrict_extent", "checkbox");
- $form->setType("sld_marqueur", "text");
- $form->setType("sld_data", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("sld_marqueur", "upload");
+ } else {
+ $form->setType("sld_marqueur", "upload2");
+ }
+ if ($this->retourformulaire == "") {
+ $form->setType("sld_data", "upload");
+ } else {
+ $form->setType("sld_data", "upload2");
+ }
$form->setType("point_centrage", "geom");
}

@@ -369,8 +389,8 @@
$form->setType("fond_default", "hiddenstatic");
$form->setType("om_sig_extent", "selectstatic");
$form->setType("restrict_extent", "hiddenstatic");
- $form->setType("sld_marqueur", "hiddenstatic");
- $form->setType("sld_data", "hiddenstatic");
+ $form->setType("sld_marqueur", "filestatic");
+ $form->setType("sld_data", "filestatic");
$form->setType("point_centrage", "geom");
}

@@ -409,8 +429,8 @@
$form->setType("fond_default", "static");
$form->setType("om_sig_extent", "selectstatic");
$form->setType("restrict_extent", "checkboxstatic");
- $form->setType("sld_marqueur", "static");
- $form->setType("sld_data", "static");
+ $form->setType("sld_marqueur", "file");
+ $form->setType("sld_data", "file");
$form->setType("point_centrage", "geom");
}