From e1b7a107ca9e29796da03b28741d5ed6ecb52291 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 19 Nov 2021 22:24:55 +0300
Subject: [PATCH] Fix disabling rotation for smart arts/images/charts

---
 .../documenteditor/main/app/template/ShapeSettings.template | 4 ++--
 apps/documenteditor/main/app/view/ShapeSettings.js          | 6 +++---
 .../main/app/template/ShapeSettings.template                | 6 +++---
 apps/presentationeditor/main/app/view/ShapeSettings.js      | 4 ++--
 .../main/app/template/ShapeSettings.template                | 6 +++---
 apps/spreadsheeteditor/main/app/view/ShapeSettings.js       | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/documenteditor/main/app/template/ShapeSettings.template b/apps/documenteditor/main/app/template/ShapeSettings.template
index 2b0236adf..fe544f539 100644
--- a/apps/documenteditor/main/app/template/ShapeSettings.template
+++ b/apps/documenteditor/main/app/template/ShapeSettings.template
@@ -147,12 +147,12 @@
             <div class="separator horizontal"></div>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td class="padding-small">
             <label class="header"><%= scope.textRotation %></label>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td>
             <table cols="2" style="width: 100%;">
                 <tr>
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 26dfb0a23..8b7cc35d2 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -819,8 +819,8 @@ define([
                 this._noApply = true;
 
                 this.disableControls(this._locked, !shapeprops.get_CanFill());
-                this.hideShapeOnlySettings(shapeprops.get_FromChart() || shapeprops.get_FromImage());
-                this.hideRotationSettings(shapeprops.get_FromSmartArt());
+                this.hideShapeOnlySettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage());
+                this.hideRotationSettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage() || shapeprops.get_FromSmartArt());
 
                 var hidechangetype = shapeprops.get_FromChart() || shapeprops.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
                     || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
@@ -1216,7 +1216,7 @@ define([
                 this._noApply = false;
             }
             this.hideNoFormSettings(control_props);
-            this.ShapeOnlySeparator.toggleClass('hidden', (control_props || this._state.HideShapeOnlySettings || this._state.HideRotationSettings)==true);
+            this.ShapeOnlySeparator.toggleClass('hidden', (control_props || this._state.HideShapeOnlySettings || this._state.HideRotationSettings)===true);
         },
 
         btnDirectionRedraw: function(slider, gradientColorsStr) {
diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index bc8a1ba44..4d8534512 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -142,17 +142,17 @@
         </div>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td class="padding-small">
             <div class="separator horizontal"></div>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td class="padding-small">
             <label class="header"><%= scope.textRotation %></label>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td>
             <table cols="2" style="width: 100%;">
                 <tr>
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 49a27fc3c..c9183dd01 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -765,8 +765,8 @@ define([
                 var shapetype = props.asc_getType();
 
                 this.disableControls(this._locked==true, props.get_CanFill() !== true);
-                this.hideShapeOnlySettings(props.get_FromChart() || props.get_FromImage());
-                this.hideRotationSettings(props.get_FromSmartArt());
+                this.hideShapeOnlySettings(props.get_FromChart() || !!props.get_FromImage());
+                this.hideRotationSettings(props.get_FromChart() || !!props.get_FromImage() || props.get_FromSmartArt());
 
                 var hidechangetype = props.get_FromChart() || props.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
                     || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
index bc8a1ba44..4d8534512 100644
--- a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
@@ -142,17 +142,17 @@
         </div>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td class="padding-small">
             <div class="separator horizontal"></div>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td class="padding-small">
             <label class="header"><%= scope.textRotation %></label>
         </td>
     </tr>
-    <tr class="shape-only shape-rotation">
+    <tr class="shape-rotation">
         <td>
             <table cols="2" style="width: 100%;">
                 <tr>
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index a58b5616c..b67072029 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -761,8 +761,8 @@ define([
                 this._noApply = true;
 
                 this.disableControls(this._locked, !shapeprops.asc_getCanFill());
-                this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || shapeprops.asc_getFromImage());
-                this.hideRotationSettings(shapeprops.asc_getFromSmartArt());
+                this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage());
+                this.hideRotationSettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage() || shapeprops.asc_getFromSmartArt());
 
                 var hidechangetype = shapeprops.get_FromChart() || shapeprops.asc_getFromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
                     || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'