hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-726_delete-candidate

Browse Source 
- change : thesaurus pool notifications is 10s
- fix : thesaurus / delete term is ok

#time 1h
This commit is contained in:
Jean-Yves Gaulier
2016-06-28 19:10:23 +02:00
parent 9c32183747
commit 69cc533ff6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php
View File

@@ -1834,7 +1834,7 @@ class ThesaurusController extends Controller
$this->renumerate($newte, $ct->getAttribute("id") . "." . $teid, $chgids); $this->renumerate($newte, $ct->getAttribute("id") . "." . $teid, $chgids);
$databox->saveThesaurus($domth); $databox->saveCterms($domct);
$this->dispatch( $this->dispatch(
ThesaurusEvents::CONCEPT_TRASHED, ThesaurusEvents::CONCEPT_TRASHED,
@@ -1843,7 +1843,7 @@ class ThesaurusController extends Controller
$thnode_parent->removeChild($thnode); $thnode_parent->removeChild($thnode);
$databox->saveCterms($domct); $databox->saveThesaurus($domth);
$r = $refresh_list->appendChild($ret->createElement("refresh")); $r = $refresh_list->appendChild($ret->createElement("refresh"));
$r->setAttribute("id", $pid); $r->setAttribute("id", $pid);

7
templates/web/thesaurus/thesaurus.html.twig
View File

@@ -131,11 +131,7 @@
alert("{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans }}"); alert("{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans }}");
self.location.replace(self.location.href); self.location.replace(self.location.href);
} }
//if(manageSession(data)) window.setTimeout("pollNotifications();", 10000);
var t = 5000; // 120000;
if(data.apps && parseInt(data.apps)>1)
t = Math.round((Math.sqrt(parseInt(data.apps)-1) * 1.3 * 120000));
window.setTimeout("pollNotifications();", t);
return; return;
} }
@@ -1022,6 +1018,7 @@
if(confirm("{{ 'thesaurus:: deplacer le terme dans la corbeille ?' | trans | e('js') }}"+"\n\n"+fullpath+"\n\n")) if(confirm("{{ 'thesaurus:: deplacer le terme dans la corbeille ?' | trans | e('js') }}"+"\n\n"+fullpath+"\n\n"))
{ {
console.log(url);
// xmlhttp/delts.x.php?bid=15&id=T1.629&debug=1 // xmlhttp/delts.x.php?bid=15&id=T1.629&debug=1
// alert(url+"?"+parms); // alert(url+"?"+parms);
ret = loadXMLDoc(url, parms, true); ret = loadXMLDoc(url, parms, true);