rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

Merge branch 'dev' for release 5.5.3

Browse Source
This commit is contained in:
Sylvain 2022-11-17 12:16:49 +01:00
commit 6b48cf221f
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog Fab-manager # Changelog Fab-manager
## v5.5.3 2022 November 17
- By default, sort invoices by date in the admin list
- Fix a bug: unable to reserve a machine with payment on site
- Fix a security issue: updated loader-utils to 1.4.2 to fix [CVE-2022-37601](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37601), [CVE-2022-37603](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37603) and [CVE-2022-37599](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37599)
## v5.5.2 2022 November 16 ## v5.5.2 2022 November 16
- Fix a bug: unable to export statistics - Fix a bug: unable to export statistics

2
app/frontend/src/javascript/controllers/admin/invoices.js
View File

@ -51,7 +51,7 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
$scope.noMoreResults = false; $scope.noMoreResults = false;
// Default invoices ordering/sorting // Default invoices ordering/sorting
$scope.orderInvoice = '-reference'; $scope.orderInvoice = '-date';
// Invoice PDF filename settings (and example) // Invoice PDF filename settings (and example)
$scope.file = { $scope.file = {

4
app/frontend/src/javascript/directives/cart.js
View File

@ -824,8 +824,8 @@ Application.Directives.directive('cart', ['$rootScope', '$uibModal', 'dialogs',
($scope.user.id === $rootScope.currentUser.id && amountToPay > 0)) { ($scope.user.id === $rootScope.currentUser.id && amountToPay > 0)) {
return payOnline(items); return payOnline(items);
} else { } else {
if (AuthService.isAuthorized(['admin', 'manager'] && $scope.user.id !== $rootScope.currentUser.id) || if ((AuthService.isAuthorized(['admin', 'manager']) && $scope.user.id !== $rootScope.currentUser.id) ||
(amountToPay === 0 && !hasOtherDeadlines())) { (amountToPay === 0 && !hasOtherDeadlines())) {
return payOnSite(items); return payOnSite(items);
} }
} }

6
app/models/history_value.rb
View File

@ -5,13 +5,11 @@ class HistoryValue < Footprintable
belongs_to :setting belongs_to :setting
belongs_to :invoicing_profile belongs_to :invoicing_profile
delegate :user, to: :invoicing_profile
after_create :chain_record after_create :chain_record
def sort_on_field def sort_on_field
'created_at' 'created_at'
end end
def user
invoicing_profile.user
end
end end

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fab-manager", "name": "fab-manager",
"version": "5.5.2", "version": "5.5.3",
"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.", "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": [ "keywords": [
"fablab", "fablab",

6
yarn.lock
View File

@ -5373,9 +5373,9 @@ loader-runner@^4.2.0:
integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0: loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0:
version "1.4.1" version "1.4.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q== integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
dependencies: dependencies:
big.js "^5.2.2" big.js "^5.2.2"
emojis-list "^3.0.0" emojis-list "^3.0.0"