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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2013-04-03 10:50:39 +02:00
parent 34d2060835 3eb81b3712
commit 31f7bac356
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Alchemy/Phrasea/Core/Configuration.php
View File

@@ -202,10 +202,15 @@ class Configuration
return $this->specifications->delete();
}
public function setConfigurations($configurations)
public function setConfigurations($configurations, $environment = null)
{
$this->specifications->setConfigurations($configurations);
$this->configuration = new ParameterBag($configurations[$this->environment]);
if (null === $environment) {
$environment = $this->environment;
}
$this->setEnvironnement($environment);
return $this->getConfigurations();
}

2
lib/Alchemy/Phrasea/Setup/Installer.php
View File

@@ -266,7 +266,7 @@ class Installer
}
}
$this->app['phraseanet.configuration']->setConfigurations($arrayConf);
$this->app['phraseanet.configuration']->setConfigurations($arrayConf, $arrayConf['environment']);
$this->app['phraseanet.configuration']->setBinaries(array('binaries' => $this->binaryData));
}
}

2
lib/classes/module/report/dashboard.php
View File

@@ -65,6 +65,8 @@ class module_report_dashboard implements module_report_dashboard_componentInterf
public $nb_days;
public $nb_days;
/**
* Construit un dashboard selon les droits du usrid, si sbas vaut null
* c'est un report sur toutes les bases, sinon sur le sbasid

9
www/prod/ThumbExtractor.js
View File

@@ -187,7 +187,11 @@
*/
var ThumbEditor = function(videoId, canvaId){
var editorVideo = new Video(document.getElementById(videoId));
var domElement = document.getElementById(videoId);
if (null !== domElement) {
var editorVideo = new Video(domElement);
}
var store = new Store();
function getCanva(){
@@ -198,7 +202,8 @@
isSupported : function () {
var elem = document.createElement('canvas');
return !! elem.getContext && !! elem.getContext('2d');
return !! document.getElementById(videoId) && document.getElementById(canvaId)
&& !! elem.getContext && !! elem.getContext('2d');
},
screenshot : function(){
var screenshot = new ScreenShot(