Merge branch 'dev' into project-index-turbofy

opf · Aug 12, 2024 · b2ba5db · b2ba5db
2 parents 34c6151 + 806ba8f
commit b2ba5db
Show file tree

Hide file tree

Showing 218 changed files with 1,820 additions and 1,707 deletions.
diff --git a/Gemfile b/Gemfile
@@ -397,4 +397,4 @@ end
 
 gem "openproject-octicons", "~>19.18.0"
 gem "openproject-octicons_helper", "~>19.18.0"
-gem "openproject-primer_view_components", "~>0.41.0"
+gem "openproject-primer_view_components", "~>0.42.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -755,8 +755,9 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.4)
+    oj (3.16.5)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     okcomputer (1.18.5)
     omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
@@ -780,7 +781,7 @@ GEM
       actionview
       openproject-octicons (= 19.18.0)
       railties
-    openproject-primer_view_components (0.41.0)
+    openproject-primer_view_components (0.42.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.17.0)
@@ -792,6 +793,7 @@ GEM
       openssl (> 2.0)
     optimist (3.1.0)
     os (1.1.4)
+    ostruct (0.6.0)
     ox (2.14.18)
     paper_trail (15.1.0)
       activerecord (>= 6.1)
@@ -1278,7 +1280,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.18.0)
   openproject-octicons_helper (~> 19.18.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.41.0)
+  openproject-primer_view_components (~> 0.42.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

diff --git a/app/components/work_packages/split_view_component.sass b/app/components/work_packages/split_view_component.sass
@@ -1,6 +1,6 @@
 .op-work-package-split-view
   height: 100%
-  width: 580px
+  width: 550px
   justify-content: space-around
   border-left: 1px solid var(--borderColor-muted)
   border-top: 1px solid var(--borderColor-muted)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
@@ -82,7 +82,7 @@ def filtered_query
     case params[:filter]
     when "project"
       id = params[:name].to_i
-      query.where(:project, "=", [id])
+      query.where(:project_id, "=", [id])
     when "reason"
       query.where(:reason, "=", [params[:name]])
     end

diff --git a/app/helpers/colors_helper.rb b/app/helpers/colors_helper.rb
@@ -139,9 +139,7 @@ def default_variables_dark
   end
 
   def default_variables_light
-    "--lightness-threshold: 0.453;
-     --border-threshold: 0.75;
-     --border-alpha: max(0, min(calc((var(--perceived-lightness) - var(--border-threshold)) * 100), 1));"
+    "--lightness-threshold: 0.453;"
   end
 
   def highlighted_background_dark
@@ -158,7 +156,7 @@ def highlighted_background_light
     if mode == "light_high_contrast"
       style += "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 75) * 1%), 1) !important;"
     else
-      style += "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 25) * 1%), var(--border-alpha)) !important;"
+      style += "border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 15) * 1%)) !important;"
     end
 
     style

diff --git a/app/menus/notifications/menu.rb b/app/menus/notifications/menu.rb
@@ -108,7 +108,7 @@ def query_params(filter, name)
     end
 
     def selected?(query_params)
-      params[:filter] == query_params[:filter] && params[:name] == query_params[:name]
+      params[:filter] == query_params[:filter] && params[:name] == query_params[:name].to_s
     end
 
     def query_path(query_params)

diff --git a/config/locales/crowdin/af.seeders.yml b/config/locales/crowdin/af.seeders.yml
@@ -80,26 +80,26 @@ af:
       projects:
         demo-project:
           name: Demo project
-          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          status_explanation: Alle take is op skedule. Die betrokke mense ken hul take. Die stelsel is heeltemal opgestel.
           description: This is a short summary of the goals of this demo project.
           news:
             item_0:
-              title: Welcome to your demo project
+              title: Welkom by jou demo-projek
               summary: |
-                We are glad you joined.
-                In this module you can communicate project news to your team members.
-              description: The actual news
+                Ons is bly jy het aangesluit.
+                In hierdie module kan jy projeknuus aan jou spanlede kommunikeer.
+              description: Die werklike nuus
           categories:
-            item_0: Category 1 (to be changed in Project settings)
+            item_0: Kategorie 1 (moet verander word in Projek-instellings)
           queries:
             item_0:
-              name: Project plan
+              name: Projek plan
             item_1:
-              name: Milestones
+              name: Mylpaal
             item_2:
-              name: Tasks
+              name: Take
             item_3:
-              name: Team planner
+              name: Spanbeplanner
           boards:
             kanban:
               name: Kanban board
@@ -120,7 +120,7 @@ af:
             widgets:
               item_0:
                 options:
-                  name: Welcome
+                  name: Welkom
               item_1:
                 options:
                   name: Om te begin
@@ -145,7 +145,7 @@ af:
                   name: Werkspakkete
               item_6:
                 options:
-                  name: Milestones
+                  name: Mylpaal
           work_packages:
             item_0:
               subject: Start of project
@@ -198,14 +198,14 @@ af:
             More information: [https://www.openproject.org/docs/user-guide/wiki/](https://www.openproject.org/docs/user-guide/wiki/)
         scrum-project:
           name: Scrum project
-          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          status_explanation: Alle take is op skedule. Die betrokke mense ken hul take. Die stelsel is heeltemal opgestel.
           description: This is a short summary of the goals of this demo Scrum project.
           news:
             item_0:
               title: Welcome to your Scrum demo project
               summary: |
-                We are glad you joined.
-                In this module you can communicate project news to your team members.
+                Ons is bly jy het aangesluit.
+                In hierdie module kan jy projeknuus aan jou spanlede kommunikeer.
           versions:
             item_0:
               name: Bug Backlog
@@ -264,21 +264,21 @@ af:
             item_3:
               name: Sprint 2
           categories:
-            item_0: Category 1 (to be changed in Project settings)
+            item_0: Kategorie 1 (moet verander word in Projek-instellings)
           queries:
             item_0:
-              name: Project plan
+              name: Projek plan
             item_1:
-              name: Product backlog
+              name: Produk agterstand
             item_2:
               name: Sprint 1
             item_3:
-              name: Tasks
+              name: Take
           boards:
             kanban:
               name: Kanban board
             basic:
-              name: Task board
+              name: Taak bord
               lists:
                 item_0:
                   name: Wish list
@@ -292,7 +292,7 @@ af:
             widgets:
               item_0:
                 options:
-                  name: Welcome
+                  name: Welkom
               item_1:
                 options:
                   name: Om te begin
@@ -316,7 +316,7 @@ af:
                   name: Werkspakkete
               item_6:
                 options:
-                  name: Project plan
+                  name: Projek plan
           work_packages:
             item_0:
               subject: New login screen