/trunk/jrest/services/CoelCollectionAPublication.php |
---|
30,10 → 30,11 |
// Construction de la requête |
$requete = (($this->distinct) ? 'SELECT DISTINCT ' : 'SELECT '). |
' ccapu.*, cpu.* '. |
' ccapu.*, cpu.*, cs_nom '. |
'FROM coel_collection_a_publication AS ccapu '. |
' LEFT JOIN coel_meta_historique_ligne ON (ccapu_ce_meta = cmhl_id_historique_ligne) '. |
' LEFT JOIN coel_publication AS cpu ON (ccapu_id_publication = cpu_id_publication) '. |
' LEFT JOIN coel_structure AS cs ON (cs_id_structure = cpu_ce_truk_editeur) '. |
((count($p) != 0) ? 'WHERE ' : ''). |
(isset($p['id_collection']) ? "AND ccapu_id_collection = {$p['id_collection']} " : ''). |
(isset($p['source']) ? "AND ccapu_source = {$p['source']} " : ''). |
50,7 → 51,19 |
} |
$nbElements = $this->bdd->query($requeteCount)->rowCount(); |
// Bricolage crado pour remplacer les "ce_" éditeurs par la valeur jointe depuis coel_structure |
foreach ($donnees as &$d) { |
$ce_ed = $d['cpu_ce_truk_editeur']; |
if (is_numeric($ce_ed)) { |
$cs_nom = $d['cs_nom']; |
if ($cs_nom === null) { |
$cs_nom = ""; // c'est ça ou rien |
} |
$d['cpu_ce_truk_editeur'] = $cs_nom; |
} |
} |
$info['nbElements'] = $nbElements; |
$info['collectionsAPublication'] = $donnees; |
/trunk/src/org/tela_botanica/client/Coel.java |
---|
66,4 → 66,16 |
console.log(o); |
} |
}-*/; |
/** |
* Envoie la trace de pile d'une exception dans FeuInsecte histoire de savoir un peu ce |
* qui se passe sans avoir besoin d'installer un plugin tout fané qui existe même plus |
*/ |
public static void traceDePile(Exception e) { |
String cacaDePoulet = ""; |
for (StackTraceElement element : e.getStackTrace()) { |
cacaDePoulet += " " + element + "\n"; |
} |
Coel.LogVersFirebug(cacaDePoulet); |
} |
} |
/trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
---|
54,7 → 54,6 |
import com.extjs.gxt.ui.client.widget.toolbar.SeparatorToolItem; |
import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; |
import com.google.gwt.core.client.GWT; |
import com.google.gwt.user.client.Window; |
import com.extjs.gxt.ui.client.widget.form.CheckBox; |
public class CollectionFormPublication extends FormulaireOnglet implements Rafraichissable { |
141,10 → 140,7 |
barreOutils.add(publicationsBoutonSupprimer); |
barreOutils.add(new SeparatorToolItem()); |
Button rafraichirBouton = creerBoutonRafraichir(); |
barreOutils.add(rafraichirBouton); |
return barreOutils; |
} |
239,18 → 235,7 |
}); |
return bouton; |
} |
private Button creerBoutonRafraichir() { |
Button bouton = new Button(i18nC.rafraichir()); |
bouton.setIcon(Images.ICONES.rafraichir()); |
bouton.addSelectionListener(new SelectionListener<ButtonEvent>() { |
public void componentSelected(ButtonEvent ce) { |
actualiserGrille(); |
} |
}); |
return bouton; |
} |
private void actualiserGrille() { |
if (mode.equals(Formulaire.MODE_MODIFIER)) { |
mediateur.selectionnerCollectionAPublication(this, collection.getId(), null); |
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1891-1892 |
/trunk/src/org/tela_botanica/client/vues/collection |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection:r1891-1892 |
/trunk/src/org/tela_botanica/client |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.8-narince/src/org/tela_botanica/client:r1891-1892 |
/trunk/src |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.8-narince/src:r1891-1892 |
/trunk/. |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.8-narince:r1891-1892 |