исправление разных неточностей после релиза 2.5.0

instantsoft · Apr 12, 2016 · 803ede7 · 803ede7 · Loadir · Apr 13, 2016
1 parent 412bde9
commit 803ede7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/system/controllers/admin/actions/index_chart_data.php b/system/controllers/admin/actions/index_chart_data.php
@@ -69,6 +69,12 @@ private function getData($source, $period){
                 filterFunc($source['key'], "(CURDATE() - INTERVAL {$period} DAY)", '>=')->
                 orderBy($source['key'], 'asc');
 
+        if(isset($source['filter'])){
+            foreach ($source['filter'] as $field_name => $value) {
+                $this->model->filterEqual($field_name, $value);
+            }
+        }
+
         $this->model->group_by = $period < 300 ? "DAY({$source['key']})" : "MONTH({$source['key']})";
 
         return $this->model->get($source['table'], false, false);

diff --git a/templates/default/controllers/geo/widget.tpl.php b/templates/default/controllers/geo/widget.tpl.php
@@ -32,5 +32,6 @@
 <script type="text/javascript">
     $(function(){
         $('#geo_window .list > select').chosen({no_results_text: '<?php echo LANG_LIST_EMPTY; ?>', width: '100%', search_placeholder: '<?php echo LANG_BEGIN_TYPING; ?>'});
+        $('#geo_window .list > select').first().trigger('change');
     });
 </script>
diff --git a/templates/default/js/modal.js b/templates/default/js/modal.js
@@ -58,6 +58,8 @@ icms.modal = (function ($) {
 
     this.setCallback = function(event, callback){
         switch(event){
+            case 'open':
+                $.nmTop().callbacks.afterShowCont = callback; break;
             case 'close':
                 $.nmTop().callbacks.beforeClose = callback; break;
         }

diff --git a/wysiwyg/redactor/wysiwyg.class.php b/wysiwyg/redactor/wysiwyg.class.php
@@ -39,7 +39,7 @@ public function displayEditor($field_id, $content=''){
                     });
                     <?php if(!cmsCore::getInstance()->request->isAjax()){ ?>
                         $(window).on('resize', function (){
-                            $('#<?php echo $dom_id; ?>').parent().width($('#f_<?php echo $dom_id; ?>').width());
+                            $('#<?php echo $dom_id; ?>').width($('#f_<?php echo $dom_id; ?>').width());
                         }).triggerHandler('resize');
                     <?php } ?>
                 });