Dashboard - Only reset the fullscreen dashlet when maximizing

diff --git a/ang/crmDashboard/Dashboard.html b/ang/crmDashboard/Dashboard.html
index 15fe25a15bb9f906d07ecf5c1dc18ab317532a6e..f0d044501c2df209e8f3b681b7bb0918ccfd2ec3 100644 (file)
--- a/ang/crmDashboard/Dashboard.html
+++ b/ang/crmDashboard/Dashboard.html
@@ -17,10 +17,10 @@
       </div>
     </div>
   </fieldset>
-  <div class="crm-flex-box" ng-if="!$ctrl.fullscreenDashlet">
+  <div class="crm-flex-box">
     <div ng-repeat="column in $ctrl.columns" class="crm-flex-{{2 + $index}} crm-dashboard-droppable" ng-model="column" ui-sortable="$ctrl.sortableOptions">
       <div ng-repeat="dashlet in column" class="crm-dashlet">
-        <crm-dashlet dashlet="dashlet" remove="$ctrl.removeDashlet($parent.$index, $index)" fullscreen="$ctrl.showFullscreen(dashlet)" ></crm-dashlet>
+        <crm-dashlet dashlet="dashlet" remove="$ctrl.removeDashlet($parent.$index, $index)" fullscreen="$ctrl.showFullscreen(dashlet)" ng-if="$ctrl.fullscreenDashlet !== dashlet.name"></crm-dashlet>
       </div>
     </div>
   </div>

diff --git a/ang/crmDashboard/crmDashboard.component.js b/ang/crmDashboard/crmDashboard.component.js
index 3e0db13d0d603c7c4030e21723a8987d1a1fd341..b9536ad4b3b1750038cb3321c8624a2420e1d871 100644 (file)
--- a/ang/crmDashboard/crmDashboard.component.js
+++ b/ang/crmDashboard/crmDashboard.component.js
@@ -100,7 +100,7 @@
       };
 
       this.showFullscreen = function(dashlet) {
-        ctrl.fullscreenDashlet = true;
+        ctrl.fullscreenDashlet = dashlet.name;
         var options = CRM.utils.adjustDialogDefaults({
           width: '90%',
           height: '90%',