Browse Source

Dashboard : correctifs divers

idleman 1 year ago
parent
commit
94ca1bef59

+ 8 - 2
plugin/dashboard/action.php

@@ -210,9 +210,15 @@ Action::register('dashboard_widget_configure_form',function(&$response){
 	if(!$widget) throw new Exception('Widget introuvable');
 	$model = DashboardWidget::model($widget->model);
 
-	$widget->meta = json_decode($widget->meta,true);
-	if(!is_array($widget->meta)) $widget->meta = array();
+	if(!is_array($widget->meta)){
+		$widget->meta = json_decode($widget->meta,true);
+		if(!is_array($widget->meta)) $widget->meta = array();
+	}
 
+	if(!isset($model->configure)) $model->configure = function($widget){
+		echo 'Aucune configuration disponible';
+		return;
+	};
 	$configure = $model->configure;
 	$configure($widget);
 	exit();

+ 4 - 2
plugin/dashboard/js/component.js

@@ -157,8 +157,10 @@ function init_components_dashboard(input){
 
 			 			$('#dashboard-configure-content').html($('#properties-model').html());
 
-			 			$('#dashboard-properties-form').load('action.php',{action:data.onConfigureForm,id :  widget.id});
-			 			init_components();
+			 			$('#dashboard-properties-form').load('action.php',{action:data.onConfigureForm,id :  widget.id},function(){
+			 				init_components();
+			 			});
+			 			
 			 			$('#dashboard-properties-save').click(function(){
 			 				var bundle ={
 		 						action :  data.onConfigure,

+ 1 - 0
plugin/navigation/navigation.plugin.php

@@ -292,6 +292,7 @@ Plugin::addHook('widget',function(&$models){
 
 			if(empty($widget->meta['label'])) $widget->meta['label'] =  'Bloc Menu';
 			if(empty($widget->meta['url'])) $widget->meta['url'] = '';
+			if(empty($widget->meta['color'])) $widget->meta['color'] = '#007bff';