Changeset 681f10f

Timestamp:

05/20/10 09:54:19 (2 years ago)

Author:

benoitg <benoitg@…>

Branches:

('master', '8434b8322dd6f8ff37c17bd45b94e7a826f86b53')('vitrine', 'afe109c61a407808bd54d88bcccb1cde726a010a')

Children:

6db528aac0691764b2d52a2ecbccf53023111828

Parents:

448fe29285570d7afd151d260ccdec949c3eb7d8

git-author:

benoitg <benoitg@9a151f2f-a8df-0310-a5c5-9fb547312938>2010-05-20 13:54:19+00:00

git-committer:

benoitg <benoitg@9a151f2f-a8df-0310-a5c5-9fb547312938>2010-05-20 13:54:19+00:00

Message:

LomClassification::_TaxonPathPreAddButtonCallback(): Fix getting last (real) theme, and make display more explicit

git-svn-id: ​http://projects.coeus.ca/svn/eureka@575 9a151f2f-a8df-0310-a5c5-9fb547312938

File:

• trunk/html/classes/LomClassification.php (modified) (1 diff)

trunk/html/classes/LomClassification.php

@@ -117 +117 @@
         function _TaxonPathPreAddButtonCallback()
         {
-                echo "&nbsp;&nbsp;<b>Créer selon : </b>";
+            $theme = $this->mSession->getLastRealTheme();
+                echo "<b>".sprintf(_("New path.  Create manually, or from a vocabulary associated with the last navigated theme \"%s\" (or a parent):"), $theme)." </b>";
                 $generateur = new FormSelectGenerator();
                 $select = '';
                 //$select = $generateur -> generateFromTable('thesauri', 'thesauri_id', 'thesauri_id', null, 'lom_9_2_new_taxon_path', 'LomClassification', false, true, 'aucun, entrer le chemin manuellement');
-                $theme = $this->mSession->getLastTheme();
+
                 $sql = "SELECT themes_has_vocabulary.vdex_4_vocabulary_identifier FROM themes_has_vocabulary JOIN vocabulary_terms ON (theme_vdex_6_1_identifier=vocabulary_terms.vdex_6_1_identifier AND theme_vdex_4_vocabulary_identifier=vocabulary_terms.vdex_4_vocabulary_identifier) WHERE ns_left <= $theme->mLeft AND ns_right >= $theme->mRight AND vocabulary_terms.vdex_4_vocabulary_identifier='".VOC_EUREKA_THEME."' ORDER BY ns_left";
                 $select = $generateur->generateFromSqlSelect($sql, 'vdex_4_vocabulary_identifier', 'vdex_4_vocabulary_identifier', null, 'classification_'.$this->mId.'_new_taxon_path_voc', 'LomClassification', false, true, _("None, specify the path manually"));