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

fix groups and tags in manager creation + helpers to get users w/ role partner|manager

Browse Source
This commit is contained in:
Sylvain 2020-04-22 10:46:46 +02:00
parent e1a8646e5f
commit c30ae8179e
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1096,7 +1096,7 @@ Application.Controllers.controller('NewManagerController', ['$state', '$scope',
};
// list of all groups
$scope.groups = groupsPromise;
$scope.groups = groupsPromise.filter(function (g) { return (g.slug !== 'admins') && !g.disabled; });
// list of all tags
$scope.tags = tagsPromise;

3
app/controllers/api/users_controller.rb
View File

@ -49,7 +49,8 @@ class API::UsersController < API::ApiController
def manager_params
params.require(:manager).permit(
:username, :email, :group_id, :tag_ids,
:username, :email, :group_id,
tag_ids: [],
profile_attributes: %i[first_name last_name phone],
invoicing_profile_attributes: [address_attributes: [:address]],
statistic_profile_attributes: %i[gender birthday]

8
app/models/user.rb
View File

@ -97,6 +97,14 @@ class User < ApplicationRecord
User.with_role(:member)
end
def self.partners
User.with_role(:partner)
end
def self.managers
User.with_role(:manager)
end
def self.superadmin
return unless Rails.application.secrets.superadmin_email.present?