Merge branch 'develop' into release/3.0.0

otto-torino · Jan 31, 2024 · 8830ff2 · 8830ff2
2 parents 40fa5dd + 00187c1
commit 8830ff2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/src/core/ChangeForm.js b/baton/static/baton/app/src/core/ChangeForm.js
@@ -202,6 +202,7 @@ const ChangeForm = {
         })
     },
     fixSubmitRow: function() {
+        $('#content-main form').addClass('with-baton-fixed-submit-row')
         $('form .submit-row').addClass('baton-fixed-submit-row')
         const footerHeight = $('#footer').outerHeight()
         let fixPosition = function() {

diff --git a/baton/static/baton/app/src/styles/_placeholders.scss b/baton/static/baton/app/src/styles/_placeholders.scss
@@ -947,3 +947,7 @@
     }
   }
 }
+
+.change-form #content form.with-baton-fixed-submit-row {
+    margin-bottom: 80px !important;
+}
diff --git a/testapp/app/app/settings.py b/testapp/app/app/settings.py
@@ -117,7 +117,7 @@
     'SITE_TITLE': 'Baton Test App',
     'INDEX_TITLE': 'Baton administration',
     'SUPPORT_HREF': 'mailto:[email protected]',
-    'COPYRIGHT': 'copyright © 2022 <a href="https://www.otto.to.it">Otto srl</a>',  # noqa
+    'COPYRIGHT': 'copyright © 2024 <a href="https://www.otto.to.it">Otto srl</a>',  # noqa
     'POWERED_BY': 'Otto srl',
     'CONFIRM_UNSAVED_CHANGES': False,
     'SHOW_MULTIPART_UPLOADING': True,

diff --git a/testapp/app/app/tests/test_e2e_tabs.py b/testapp/app/app/tests/test_e2e_tabs.py
@@ -1,19 +1,18 @@
 import os
 import time
 
-from django.test import TestCase
+from django.test import TestCase 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 
 from .utils import element_has_css_class, make_driver
 
 os.environ['WDM_LOG_LEVEL'] = '0'
 
-
 class TestBatonTabs(TestCase):
     def setUp(self):
         self.driver = make_driver()
-        self.driver.set_window_size(1920, 1080)
+        self.driver.set_window_size(1920, 2080)
         self.driver.implicitly_wait(10)
         self.login()
 
@@ -86,6 +85,7 @@ def test_tabs(self):
         self.assertEqual(len(attachments_rows), 2)
         add_button = inlines.find_element(By.CSS_SELECTOR, '.add-row a')
         self.assertEqual(add_button.is_displayed(), True)
+        self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight)")
         time.sleep(3)  # fade
         # try except because first click will fail in selenium
         try:
@@ -114,6 +114,7 @@ def test_detect_tab_error(self):
         button = self.driver.find_element(By.CSS_SELECTOR, 'input[type=submit][name=_continue]')
         time.sleep(1)
         field.send_keys('test')
+        self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight)")
         time.sleep(1)
         try:
             button.click()

diff --git a/testapp/app/app/tests/test_e2e_theme.py b/testapp/app/app/tests/test_e2e_theme.py
@@ -12,7 +12,7 @@
 class TestBatonIndex(TestCase):
     def setUp(self):
         self.driver = make_driver()
-        self.driver.set_window_size(1920, 1080)
+        self.driver.set_window_size(1920, 1280)
         self.driver.implicitly_wait(10)
         self.login()
 

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3
-Original file line number
+Diff line change
@@ Expand Up / @@ -947,3 +947,7 @@ @@
         }
       }
     }
+    .change-form #content form.with-baton-fixed-submit-row {
+        margin-bottom: 80px !important;
+    }