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

[bug] the subscription page is not available

Browse Source
This commit is contained in:
Sylvain 2020-05-12 15:16:26 +02:00
parent 0d52b36850
commit 8ea36b8a89
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog Fab-manager # Changelog Fab-manager
- Fix a bug: the subscription page is not available
## v4.4.0 2020 May 12 ## v4.4.0 2020 May 12
- Manager: a new role between the member and the administrator - Manager: a new role between the member and the administrator

2
app/assets/javascripts/controllers/plans.js.erb
View File

@ -183,7 +183,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
for (let plan of plansPromise) { for (let plan of plansPromise) {
if (plan.group_id === group.id) { if (plan.group_id === group.id) {
groupObj.plans.push(plan); groupObj.plans.push(plan);
if (!plan.disabled) { groupplansClassifiedByGroupObj.actives++; } if (!plan.disabled) { groupObj.actives++; }
} }
} }
$scope.plansClassifiedByGroup.push(groupObj); $scope.plansClassifiedByGroup.push(groupObj);

4
app/assets/templates/plans/index.html.erb
View File

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="cta-button" ng-if="!ctrl.member || ctrl.member.role == 'member' || (ctrl.member.role == 'manager' && ctrl.member.id === currentUser.id)"> <div class="cta-button" ng-if="isAuthorized('member') || (isAuthorized('manager') && ctrl.member.id === currentUser.id)">
<button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-if="ctrl.member.subscribed_plan.id != plan.id" ng-disabled="ctrl.member.subscribed_plan" ng-class="{ 'bg-yellow': selectedPlan==plan }"> <button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-if="ctrl.member.subscribed_plan.id != plan.id" ng-disabled="ctrl.member.subscribed_plan" ng-class="{ 'bg-yellow': selectedPlan==plan }">
<span ng-if="ctrl.member" translate>{{ 'app.public.plans.i_choose_that_plan' }}</span> <span ng-if="ctrl.member" translate>{{ 'app.public.plans.i_choose_that_plan' }}</span>
<span ng-if="!ctrl.member" translate>{{ 'app.public.plans.i_subscribe_online' }}</span> <span ng-if="!ctrl.member" translate>{{ 'app.public.plans.i_subscribe_online' }}</span>
@ -53,7 +53,7 @@
</div> </div>
<div class="cta-button" ng-if="isAuthorized('admin') || (ctrl.member.role == 'manager' && ctrl.member.id != currentUser.id)"> <div class="cta-button" ng-if="isAuthorized('admin') || (isAuthorized('manager') && ctrl.member.id != currentUser.id)">
<button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-class="{ 'bg-yellow': selectedPlan==plan }" ng-disabled="!ctrl.member"> <button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-class="{ 'bg-yellow': selectedPlan==plan }" ng-disabled="!ctrl.member">
<span translate>{{ 'app.public.plans.i_choose_that_plan' }}</span> <span translate>{{ 'app.public.plans.i_choose_that_plan' }}</span>
</button> </button>