hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #976 edit : character change when editing with thesaurus

Browse Source 
fix also display caption junk when a thesaurus term has no entry in the current language
This commit is contained in:
jygaulier
2012-10-31 10:42:51 +01:00
parent 409e0b1285
commit b79a9ba30b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/caption/Field/Value.class.php
View File

@@ -470,7 +470,7 @@ class caption_Field_Value implements cache_cacheableInterface
break; break;
} }
$synonyms = $XPATH_thesaurus->query("sy[@lng='" . $session->usr_i18 . "']", $node->parentNode); $synonyms = $XPATH_thesaurus->query("sy[@lng='" . $session->get_I18n() . "']", $node->parentNode);
foreach ($synonyms as $synonym) { foreach ($synonyms as $synonym) {
$k = $synonym->getAttribute("k"); $k = $synonym->getAttribute("k");
if ($synonym->getAttribute("w") != $term_noacc || $k != $context_noacc) { if ($synonym->getAttribute("w") != $term_noacc || $k != $context_noacc) {

4
www/prod/jquery.edit.js
View File

@@ -417,7 +417,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId)
+ '<table><tr><td>' + '<table><tr><td>'
+ extra + extra
+ '<span class="value" vocabId="' + (value.getVocabularyId() ? value.getVocabularyId() : '') + '">' + '<span class="value" vocabId="' + (value.getVocabularyId() ? value.getVocabularyId() : '') + '">'
+ word + $('<div/>').text(word).html()
+ "</span></td><td class='options'>" + "</span></td><td class='options'>"
+ '<a href="#" class="add_all"><img src="/skins/icons/plus11.png"/></a> ' + '<a href="#" class="add_all"><img src="/skins/icons/plus11.png"/></a> '
+ '<a href="#" class="remove_all"><img src="/skins/icons/minus11.png"/></a>' + '<a href="#" class="remove_all"><img src="/skins/icons/minus11.png"/></a>'
@@ -1288,7 +1288,7 @@ function edit_dblclickThesaurus(event) // ondblclick dans le thesaurus
case "TH_W": case "TH_W":
if(p4.edit.curField >= 0) if(p4.edit.curField >= 0)
{ {
var w = e.innerHTML; var w = $(e).text();
if(p4.edit.T_fields[p4.edit.curField].multi) if(p4.edit.T_fields[p4.edit.curField].multi)
{ {
$("#EditTextMultiValued", p4.edit.editBox).val(w); $("#EditTextMultiValued", p4.edit.editBox).val(w);