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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-20 15:53:50 +01:00
parent 692bdf71cf 3b7e0c9a30
commit 8663f49228
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/module/console/checkExtension.php
View File

@@ -288,7 +288,7 @@ class module_console_checkExtension extends Command
$output->writeln( sprintf("<info>Succes ! </info> sbid=%d, rid=%d (%d spots)", $output->writeln( sprintf("<info>Succes ! </info> sbid=%d, rid=%d (%d spots)",
$sbid, $sbid,
$ret["results"][0]["rid"], $h["results"][0]["rid"],
count($h["results"][0]["spots"])) count($h["results"][0]["spots"]))
); );
} else { } else {

4
templates/web/prod/thesaurus.js
View File

@@ -541,7 +541,7 @@ function C_MenuOption(menuItem, menu, option, parm)
// set the content of the wizard // set the content of the wizard
$("#THPD_WIZARDS .wiz_1 .txt").html(msg); $("#THPD_WIZARDS .wiz_1 .txt").html(msg);
// ... and switch to the thesaurus tab // ... and switch to the thesaurus tab
p4.thesau.tabs.tabs('active', 0); p4.thesau.tabs.tabs('option', 'active', 0);
thesauShowWizard("wiz_1", true); thesauShowWizard("wiz_1", true);
break; break;
@@ -567,7 +567,7 @@ function C_MenuOption(menuItem, menu, option, parm)
msg = $.sprintf('{{ messageMany |e }}', trees.C._selInfos.n); msg = $.sprintf('{{ messageMany |e }}', trees.C._selInfos.n);
} }
p4.thesau.tabs.tabs('active', 0); p4.thesau.tabs.tabs('option', 'active', 0);
// set the content of the wizard // set the content of the wizard
$("#THPD_WIZARDS .wiz_2 .txt").html(msg); $("#THPD_WIZARDS .wiz_2 .txt").html(msg);