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

Merge 3.6 fixes

Browse Source
This commit is contained in:
Romain Neutron
2012-03-30 14:52:43 +02:00
parent e7df74ebfe 0594b5135e
commit cc554909c0
3 changed files with 636 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1244
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

File diff suppressed because it is too large Load Diff

19
lib/classes/task/abstract.class.php
View File

@@ -262,7 +262,7 @@ $this->log(sprintf("task %d <- %s", $this->get_task_id(), $status));
return $this->completed_percentage;
}
protected $period = 60;
protected $period = 10;
protected $taskid = NULL;
protected $system = ''; // "DARWIN", "WINDOWS" , "LINUX"...
protected $argt = array(
@@ -611,19 +611,10 @@ $this->log(sprintf("task %d <- %s", $this->get_task_id(), $status));
protected function load_settings(SimpleXMLElement $sx_task_settings)
{
$this->period = (int) $sx_task_settings->period;
if($this->period <= 0 || $this->period >= 60 * 60)
$this->period = 60;
$this->maxrecs = (int) $sx_task_settings->maxrecs;
if($sx_task_settings->maxrecs < 10 || $sx_task_settings->maxrecs > 1000)
$this->maxrecs = 100;
$this->maxmegs = (int) $sx_task_settings->maxmegs;
if($sx_task_settings->maxmegs < 16 || $sx_task_settings->maxmegs > 512)
$this->maxmegs = 24;
$this->record_buffer_size = (int) $sx_task_settings->flush;
if($sx_task_settings->flush < 1 || $sx_task_settings->flush > 100)
$this->record_buffer_size = 10;
$this->period = max(10, min(3600, (int) $sx_task_settings->period));
$this->maxrecs = max(10, min(1000, (int) $sx_task_settings->maxrecs));
$this->maxmegs = max(16, min(512, (int) $sx_task_settings->maxmegs));
$this->record_buffer_size = max(1, min(100, (int) $sx_task_settings->flush));
return $this;
}

8
templates/web/prod/actions/Push.html.twig
View File

@@ -86,9 +86,11 @@
<div id="find-user">
<input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" style="width:210px;"/>
<br/>
{% trans 'Select a user in the list'%}, <br/>
{% trans 'or' %}
<a href="/prod/push/add-user/" class="user_adder link">{% trans 'Add user' %}</a>
{% trans 'Select a user in the list'%} <br/>
{% if user.ACL().has_right('manageusers') %}
{% trans 'or' %}
<a href="/prod/push/add-user/" class="user_adder link">{% trans 'Add user' %}</a>
{% endif %}
</div>
<p id="recommanded-users">