Merge branch 'dev' for release 5.6.5

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog Fab-manager
 
+## v5.6.5 2023 January 9
+
+- Moved the buttons to create a new machine or availability to the admin section
+- Fix a bug: unable to create/update machines/spaces/trainings/events/...
+
 ## v5.6.4 2023 January 9
 
 - Fix a bug: unable to build the docker image (yarn error extracting tar content of undefined failed)

app/frontend/src/stylesheets/modules/layout/header-page.scss

@@ -33,5 +33,10 @@
   .right {
     min-width: 9rem;
     border-left: 1px solid var(--gray-soft-dark);
+    .grpBtn {
+      display: flex;
+      align-items: center;
+      gap: 1.6rem;
+    }
   }
 }

app/frontend/templates/admin/machines/index.html

@@ -6,6 +6,25 @@
   <div class="center">
     <h1 translate>{{ 'app.admin.machines.the_fablab_s_machines' }}</h1>
   </div>
+
+  <div class="right">
+    <div class="grpBtn wrapper">
+      <a ng-if="isAuthorized('admin')"
+         role="button"
+         class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs"
+         ui-sref="app.admin.machines_new"
+         title="{{'app.public.machines_list.add_a_machine' | translate}}">
+        <i class="fas fa-plus"></i>
+      </a>
+      <a ng-if="isAuthorized(['admin', 'manager'])"
+         role="button"
+         ui-sref="app.admin.calendar"
+         class="btn btn-lg btn-default rounded b-2x m-t-xs"
+         title="{{'app.public.machines_list.new_availability' | translate}}">
+        <i class="fa fa-calendar-check-o" aria-hidden="true"></i>
+      </a>
+    </div>
+  </div>
 </div>
 
 <section class="m-lg admin-machines-manage">

app/frontend/templates/machines/index.html

@@ -5,30 +5,11 @@
         <a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
       </section>
     </div>
-    <div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
+    <div class="col-xs-10 col-sm-10 col-md-11 b-l b-r-md">
       <section class="heading-title">
         <h1 translate>{{ 'app.public.machines_list.the_fablab_s_machines' }}</h1>
       </section>
     </div>
-
-    <div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
-      <section class="heading-actions wrapper">
-        <a ng-if="isAuthorized('admin')"
-           role="button"
-           class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs"
-           ui-sref="app.admin.machines_new"
-           title="{{'app.public.machines_list.add_a_machine' | translate}}">
-          <i class="fas fa-plus"></i>
-        </a>
-        <a ng-if="isAuthorized(['admin', 'manager'])"
-           role="button"
-           ui-sref="app.admin.calendar"
-           class="btn btn-lg btn-default rounded b-2x m-t-xs"
-           title="{{'app.public.machines_list.new_availability' | translate}}">
-          <i class="fa fa-calendar-check-o" aria-hidden="true"></i>
-        </a>
-      </section>
-    </div>
   </div>
 </section>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.6.4",
+  "version": "5.6.5",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",
@@ -152,6 +152,7 @@
     "ngtemplate-loader": "^2.1.0",
     "nvd3": "1.8",
     "object-to-formdata-tz": "4.4.3",
+    "object-to-formdata": "npm:object-to-formdata-tz@4.4.3",
     "phosphor-react": "^1.4.0",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",

yarn.lock

@@ -8311,7 +8311,7 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-to-formdata-tz@4.4.3:
+object-to-formdata-tz@4.4.3, "object-to-formdata@npm:object-to-formdata-tz@4.4.3":
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/object-to-formdata-tz/-/object-to-formdata-tz-4.4.3.tgz#3059059d0f02ce90c7fdd9d83f491e8af34707ae"
   integrity sha512-3XK2hDLCUAfpwatU6Jr3WzzF3ncmzScXPUiIOWgXdYwnxijCojqH41w3DdHRLoPs3MgUHzHBAtLVOFmSlaDWlQ==