mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-15 14:03:27 +00:00
Use configurtion file instead of GV
This commit is contained in:
@@ -28,6 +28,7 @@ main:
|
|||||||
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
|
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
|
||||||
options: []
|
options: []
|
||||||
task-manager:
|
task-manager:
|
||||||
|
enabled: true
|
||||||
logger:
|
logger:
|
||||||
max-files: 10
|
max-files: 10
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@@ -73,7 +73,7 @@ class TaskManager implements ControllerProviderInterface
|
|||||||
*/
|
*/
|
||||||
$controllers->get('/scheduler/stop', function (Application $app, Request $request) use ($app) {
|
$controllers->get('/scheduler/stop', function (Application $app, Request $request) use ($app) {
|
||||||
|
|
||||||
if ($app['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $app['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -347,7 +347,7 @@ class TaskManager implements ControllerProviderInterface
|
|||||||
|
|
||||||
public function startScheduler(Application $app, Request $request)
|
public function startScheduler(Application $app, Request $request)
|
||||||
{
|
{
|
||||||
if ($app['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $app['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -107,7 +107,7 @@ class API_V1_adapter extends API_V1_Abstract
|
|||||||
{
|
{
|
||||||
$result = new \API_V1_result($app, $app['request'], $this);
|
$result = new \API_V1_result($app, $app['request'], $this);
|
||||||
|
|
||||||
if ($app['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $app['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
$ret = array('state' => 'disabled');
|
$ret = array('state' => 'disabled');
|
||||||
} else {
|
} else {
|
||||||
$taskManager = $app['task-manager'];
|
$taskManager = $app['task-manager'];
|
||||||
|
@@ -37,7 +37,7 @@ class module_console_schedulerStart extends Command
|
|||||||
|
|
||||||
protected function doExecute(InputInterface $input, OutputInterface $output)
|
protected function doExecute(InputInterface $input, OutputInterface $output)
|
||||||
{
|
{
|
||||||
if ($this->container['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $this->container['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
$logger = $this->container['task-manager.logger'];
|
$logger = $this->container['task-manager.logger'];
|
||||||
|
@@ -56,7 +56,7 @@ class module_console_schedulerState extends Command
|
|||||||
return self::EXITCODE_SETUP_ERROR;
|
return self::EXITCODE_SETUP_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->container['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $this->container['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -34,7 +34,7 @@ class module_console_schedulerStop extends Command
|
|||||||
|
|
||||||
protected function doExecute(InputInterface $input, OutputInterface $output)
|
protected function doExecute(InputInterface $input, OutputInterface $output)
|
||||||
{
|
{
|
||||||
if ($this->container['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $this->container['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -73,7 +73,7 @@ class module_console_taskrun extends Command
|
|||||||
return self::EXITCODE_SETUP_ERROR;
|
return self::EXITCODE_SETUP_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->container['phraseanet.registry"].get("GV_disable_task_manager']) {
|
if (false === $this->container['phraseanet.configuration']['main']['task-manager']['enabled']) {
|
||||||
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
throw new RuntimeException('The use of the task manager is disabled on this instance.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -341,19 +341,6 @@ return call_user_func_array(function(Application $app) {
|
|||||||
'required' => true
|
'required' => true
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
), array(
|
|
||||||
'section' => _('Task manager'),
|
|
||||||
'rolled' => true,
|
|
||||||
'vars' => array(
|
|
||||||
array(
|
|
||||||
'type' => \registry::TYPE_BOOLEAN,
|
|
||||||
'name' => 'GV_disable_task_manager',
|
|
||||||
'comment' => _('Disable task manager'),
|
|
||||||
'help' => '',
|
|
||||||
'default' => false,
|
|
||||||
'required' => true
|
|
||||||
)
|
|
||||||
)
|
|
||||||
), array(
|
), array(
|
||||||
'section' => _('Search engine'),
|
'section' => _('Search engine'),
|
||||||
'rolled' => true,
|
'rolled' => true,
|
||||||
|
@@ -28,6 +28,7 @@ main:
|
|||||||
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
|
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
|
||||||
options: []
|
options: []
|
||||||
task-manager:
|
task-manager:
|
||||||
|
enabled: true
|
||||||
logger:
|
logger:
|
||||||
max-files: 10
|
max-files: 10
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@@ -33,7 +33,7 @@
|
|||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
{% if not app["phraseanet.registry"].get("GV_disable_task_manager") %}
|
{% if app['phraseanet.configuration']['main']['task-manager']['enabled'] %}
|
||||||
<li class="schedMenuItem" id="schedulerStart"><a href="#">start</a></li>
|
<li class="schedMenuItem" id="schedulerStart"><a href="#">start</a></li>
|
||||||
<li class="schedMenuItem" id="schedulerStop"><a href="#">stop</a></li>
|
<li class="schedMenuItem" id="schedulerStop"><a href="#">stop</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li class="taskMenuItem" id="taskEdit_{{ task.getID() }}"><a href="#">{% trans 'Edit' %}</a></li>
|
<li class="taskMenuItem" id="taskEdit_{{ task.getID() }}"><a href="#">{% trans 'Edit' %}</a></li>
|
||||||
{% if not app["phraseanet.registry"].get("GV_disable_task_manager") %}
|
{% if app['phraseanet.configuration']['main']['task-manager']['enabled'] %}
|
||||||
<li class="taskMenuItem" id="taskStart_{{ task.getID() }}"><a href="#">{% trans 'Start' %}</a></li>
|
<li class="taskMenuItem" id="taskStart_{{ task.getID() }}"><a href="#">{% trans 'Start' %}</a></li>
|
||||||
<li class="taskMenuItem" id="taskStop_{{ task.getID() }}"><a href="#">{% trans 'Stop' %}</a></li>
|
<li class="taskMenuItem" id="taskStop_{{ task.getID() }}"><a href="#">{% trans 'Stop' %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
Reference in New Issue
Block a user