rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

[bug] wallet tab is not shown in members dashboard

Browse Source
This commit is contained in:
Sylvain 2020-09-23 10:13:41 +02:00
parent a8811afba3
commit 36d8c76ad7
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Fix a bug: unable to run tests suite with run-tests.sh
- Fix a bug: unable to search for projects (#230)
- Fix a bug: wallet tab is not shown in members dashboard
- Updated coveralls gem to a supported version
## v4.5.6 2020 September 1st

2
app/assets/javascripts/controllers/admin/pricing.js.erb
View File

@ -676,7 +676,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
content: _t('app.admin.tour.pricing.machines.content'),
placement: 'bottom'
});
if ($scope.modules.spaces) {
if ($scope.$root.modules.spaces) {
uitour.createStep({
selector: '.plans-pricing .spaces-tab',
stepId: 'spaces',

2
app/assets/javascripts/controllers/home.js
View File

@ -140,7 +140,7 @@ Application.Controllers.controller('HomeController', ['$scope', '$stateParams',
content: _t('app.public.tour.welcome.machines.content'),
placement: 'right'
});
if ($scope.modules.spaces) {
if ($scope.$root.modules.spaces) {
uitour.createStep({
selector: '.nav-primary li.reserve-space-link',
stepId: 'spaces',

10
app/assets/javascripts/controllers/main_nav.js
View File

@ -58,7 +58,7 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
];
if ($scope.modules.plans) {
if ($scope.$root.modules.plans) {
$scope.navLinks.push({
state: 'app.public.plans',
linkText: 'app.public.common.subscriptions',
@ -67,7 +67,7 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
});
}
if ($scope.modules.spaces) {
if ($scope.$root.modules.spaces) {
$scope.navLinks.splice(4, 0, {
state: 'app.public.spaces_list',
linkText: 'app.public.common.reserve_a_space',
@ -147,7 +147,7 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
$scope.adminNavLinks = adminNavLinks;
if ($scope.modules.spaces) {
if ($scope.$root.modules.spaces) {
$scope.adminNavLinks.splice(3, 0, {
state: 'app.public.spaces_list',
linkText: 'app.public.common.manage_the_spaces',
@ -155,8 +155,8 @@ Application.Controllers.controller('MainNavController', ['$scope', function ($sc
});
}
if ($scope.modules.statistics) {
$scope.adminNavLinks.splice($scope.modules.spaces ? 9 : 8, 0, {
if ($scope.$root.modules.statistics) {
$scope.adminNavLinks.splice($scope.$root.modules.spaces ? 9 : 8, 0, {
state: 'app.admin.statistics',
linkText: 'app.public.common.statistics',
linkIcon: 'bar-chart-o',

2
app/policies/setting_policy.rb
View File

@ -38,7 +38,7 @@ class SettingPolicy < ApplicationPolicy
fablab_name name_genre event_explications_alert space_explications_alert link_name home_content phone_required
tracking_id book_overlapping_slots slot_duration events_in_calendar spaces_module plans_module invoicing_module
recaptcha_site_key feature_tour_display disqus_shortname allowed_cad_extensions openlab_app_id openlab_default
online_payment_module stripe_public_key confirmation_required]
online_payment_module stripe_public_key confirmation_required wallet_module]
end
##