TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes flaw in logic 

Recompile JS from #1135
This commit is contained in:
Samuel Georges 2015-05-16 09:57:40 +10:00
parent 0b6dfc9f3f
commit 4d057ba266
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/assets/js/october-min.js vendored
View File

@ -2213,7 +2213,7 @@ $(document).render(function(){$('[data-change-monitor]').changeMonitor()})}(wind
ChartUtils.prototype.defaultValueColor='#b8b8b8';ChartUtils.prototype.getColor=function(index){var
colors=['#95b753','#cc3300','#e5a91a','#3366ff','#ff0f00','#ff6600','#ff9e01','#fcd202','#f8ff01','#b0de09','#04d215','#0d8ecf','#0d52d1','#2a0cd0','#8a0ccf','#cd0d74','#754deb','#dddddd','#999999','#333333','#000000','#57032a','#ca9726','#990000','#4b0c25'],colorIndex=index%(colors.length-1);return colors[colorIndex];}
ChartUtils.prototype.loadListValues=function($list){var result={values:[],total:0,max:0}
$('> li',$list).each(function(){var value=parseFloat($('span',this).text());result.total+=value
$('> li',$list).each(function(){var value=$(this).data('value')?parseFloat($(this).data('value')):parseFloat($('span',this).text());result.total+=value
result.values.push({value:value,color:$(this).data('color')})
result.max=Math.max(result.max,value)})
return result;}

4
modules/cms/classes/Controller.php
View File

@ -944,15 +944,17 @@ class Controller
*/
public function renderComponent($name, $parameters = [])
{
$componentVars = [];
if ($componentObj = $this->findComponentByName($name)) {
$componentObj->id = uniqid($name);
$componentObj->setProperties(array_merge($componentObj->getProperties(), $parameters));
$componentVars = $componentObj->getVars();
if ($result = $componentObj->onRender()) {
return $result;
}
}
return $this->renderPartial($name.'::default', $componentObj->getVars(), false);
return $this->renderPartial($name.'::default', $componentVars, false);
}
//