Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNOE-399] Add ACL and settings #273

Merged
merged 2 commits into from
Mar 31, 2017
Merged

[MNOE-399] Add ACL and settings #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d47b76
[MNOE-399] Add ACL and settings
ouranos Mar 31, 2017
c3c7d95
Code Review
ouranos Mar 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ angular.module('mnoEnterprise.configuration', [])
.constant('PAYMENT_CONFIG', <%= Hash(Settings.payment).to_json %>)
.constant('ORGANIZATION_MANAGEMENT', <%= Hash(Settings.organization_management).to_json %>)
.constant('USER_MANAGEMENT', <%= Hash(Settings.user_management).to_json %>)
.constant('AUDIT_LOG', <%= Hash(Settings.audit_log).to_json %>)
.constant('GOOGLE_TAG_CONTAINER_ID', <%= MnoEnterprise.google_tag_container.to_json %>)
.constant('INTERCOM_ID', <%= MnoEnterprise.intercom_app_id.to_json %>)
.constant('APP_NAME', <%= MnoEnterprise.app_name.to_json %>)
2 changes: 2 additions & 0 deletions api/app/controllers/mno_enterprise/jpi/v1/audit_events_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ class Jpi::V1::AuditEventsController < Jpi::V1::BaseResourceController
def index
@organization = MnoEnterprise::Organization.find(params.require(:organization_id))

authorize! :manage, @organization

@audit_events = MnoEnterprise::AuditEvent.where(organization_id: @organization.id)
@audit_events = @audit_events.limit(params[:limit]) if params[:limit]
@audit_events = @audit_events.skip(params[:offset]) if params[:offset]
Expand Down
19 changes: 11 additions & 8 deletions core/lib/generators/mno_enterprise/install/templates/config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ frontend_host:
#===============================================
# Feature Flags
#===============================================

# Do not display Audit Log in Organization Panel
audit_log:
enabled: false
# Display App Pricing on Marketplace
pricing:
enabled: false
Expand Down Expand Up @@ -47,17 +49,18 @@ devise:

# Admin Panel Config
admin_panel:
# Disable Impersonation
impersonation:
disabled: false
staff:
enabled: true
finance:
enabled: true
apps_management:
enabled: true
audit_log:
enabled: true
customer_management:
organization:
enabled: true
user:
enabled: true
finance:
enabled: true
impersonation:
disabled: false
staff:
enabled: true