dm_core 4.2.2.1 → 4.2.2.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e14844188fa4b0321ad7bef84d648c08c39ad8a0
4
- data.tar.gz: fc80ba672a9fe0e28a708ab10a7755c59d6fd8a8
3
+ metadata.gz: 239615be3092182426916f9368a2250a2c2e7499
4
+ data.tar.gz: a801bbe30e05c95292cc698f0fbd6e21a74c7fb6
5
5
  SHA512:
6
- metadata.gz: 0dac67d70542494df26a51d225ca7bc6c8398eb0b7c45c560f266ba1fd73919dcb4d2e52b4e689757a5fb6a132a981e371aaf14505562fc3fdab61ae18880dca
7
- data.tar.gz: 81907aa311253263e4e35579cbfd8bd8ea3c993d50533ac9958cf0c74e1a57397ed6915140cdafb6c335afc876238a4c726933919f98d4b5aba41616daf79941
6
+ metadata.gz: d455476c5fbd342051da50d966f23ca0318921437d6376b78c270822a2a7560eed0583c32c6465fb81a9b459952c6ef07cfd225c37f0ed525ea626cf49c8fdc2
7
+ data.tar.gz: cc87a037ab8507153e4b4805b39909faec633f311cc1abad5628410b406eb356cca1d4d26eb87cf48d888faea9f55de5f216a5eca7eaeb5bee4d47001dd24cd9
@@ -21,7 +21,7 @@ class DmCore::Admin::AdminController < ApplicationController
21
21
  #------------------------------------------------------------------------------
22
22
  def authenticate_admin_user!
23
23
  authenticate_user!
24
- unless can?(:access_event_section, :all) || can?(:access_admin, :all)
24
+ unless can?(:access_admin, :all)
25
25
  flash[:alert] = "Unauthorized Access!"
26
26
  redirect_to current_account.index_path
27
27
  end
@@ -77,7 +77,7 @@ private
77
77
  @admin_theme[:main_menu] << {text: 'Dashboard', icon_class: :dashboard, link: dm_core.admin_dashboard_path, active: admin_path_active_class?(dm_core.admin_dashboard_path) }
78
78
 
79
79
  if defined?(DmCms)
80
- if can?(:manage_content, :all)
80
+ if can?(:access_content_section, :all)
81
81
  @admin_theme[:main_menu] << {text: 'Pages', icon_class: :pages, link: dm_cms.admin_cms_pages_path, active: admin_path_active_class?(dm_cms.admin_cms_pages_path, dm_cms.admin_cms_snippets_path) }
82
82
  @admin_theme[:main_menu] << {text: 'Blogs', icon_class: :blogs, link: dm_cms.admin_cms_blogs_path, active: admin_path_active_class?(dm_cms.admin_cms_blogs_path) }
83
83
  end
@@ -154,14 +154,15 @@
154
154
  <% if disable_fields %>
155
155
  <%= f.input 'roles[admin]', as: :boolean, label: 'Administrator', input_html: {checked: @user.has_role?(:admin)}, disabled: true, hint: 'access to entire website' %>
156
156
  <% else %>
157
- <%= f.input('roles[reviewer]', as: :boolean, label: 'Reviewer', input_html: {checked: @user.has_role?(:reviewer)}, hint: 'will be able to view draft versions of blog entries, as long as they are sent the correct link') %>
158
- <%= f.input('roles[content_manager]', as: :boolean, label: 'Content Manager', input_html: {checked: @user.has_role?(:content_manager)}, hint: 'can manage blog and static pages') if defined?(DmCms) %>
159
- <%= f.input('roles[event_manager]', as: :boolean, label: 'Event Manager', input_html: {checked: @user.has_role?(:event_manager)}, hint: 'can manage events and workshops') if defined?(DmEvent) %>
160
- <%= f.input('roles[event_manager_alacarte]',as: :boolean, label: 'Individual Event Management', input_html: {checked: @user.has_role?(:event_manager_alacarte)}, hint: 'grant access to specific events only') if defined?(DmEvent) %>
161
- <%= f.input('roles[forum_manager]', as: :boolean, label: 'Forum Manager', input_html: {checked: @user.has_role?(:forum_manager)}, hint: 'can manage forums') if defined?(DmForum) %>
162
- <%= f.input('roles[course_manager]', as: :boolean, label: 'Course Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage courses and lessons') if defined?(DmLms) %>
163
- <%= f.input('roles[subscription_manager]', as: :boolean, label: 'Subscription Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage site subscriptions') if defined?(DmSubscriptions) %>
164
- <%#= f.input 'roles[newsletter_manager]', as: :boolean, label: 'Newsletter Manager', input_html: {checked: @user.has_role?(:newsletter_manager)}, hint: 'can manage newsletters' %>
157
+ <%= f.input('roles[reviewer]', as: :boolean, label: 'Reviewer', input_html: {checked: @user.has_role?(:reviewer)}, hint: 'will be able to view draft versions of blog entries, as long as they are sent the correct link') %>
158
+ <%= f.input('roles[content_manager]', as: :boolean, label: 'Content Manager', input_html: {checked: @user.has_role?(:content_manager)}, hint: 'can manage blog and static pages') if defined?(DmCms) %>
159
+ <%= f.input('roles[content_manager_alacarte]',as: :boolean, label: 'Individual Content Management', input_html: {checked: @user.has_role?(:content_manager_alacarte)}, hint: 'grant access to specific pages/blogs only') if defined?(DmCms) %>
160
+ <%= f.input('roles[event_manager]', as: :boolean, label: 'Event Manager', input_html: {checked: @user.has_role?(:event_manager)}, hint: 'can manage events and workshops') if defined?(DmEvent) %>
161
+ <%= f.input('roles[event_manager_alacarte]', as: :boolean, label: 'Individual Event Management', input_html: {checked: @user.has_role?(:event_manager_alacarte)}, hint: 'grant access to specific events only') if defined?(DmEvent) %>
162
+ <%= f.input('roles[forum_manager]', as: :boolean, label: 'Forum Manager', input_html: {checked: @user.has_role?(:forum_manager)}, hint: 'can manage forums') if defined?(DmForum) %>
163
+ <%= f.input('roles[course_manager]', as: :boolean, label: 'Course Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage courses and lessons') if defined?(DmLms) %>
164
+ <%= f.input('roles[subscription_manager]', as: :boolean, label: 'Subscription Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage site subscriptions') if defined?(DmSubscriptions) %>
165
+ <%#= f.input 'roles[newsletter_manager]', as: :boolean, label: 'Newsletter Manager', input_html: {checked: @user.has_role?(:newsletter_manager)}, hint: 'can manage newsletters' %>
165
166
  <hr>
166
167
  <%= f.input 'roles[manager]', as: :boolean, label: 'Manager', input_html: {checked: @user.has_role?(:manager)}, hint: 'can manage all areas except for global account settings and deleting users' %>
167
168
  <% if is_admin? %>
@@ -1,3 +1,3 @@
1
1
  module DmCore
2
- VERSION = "4.2.2.1"
2
+ VERSION = "4.2.2.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.2.1
4
+ version: 4.2.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brett Walker
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-29 00:00:00.000000000 Z
11
+ date: 2016-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails