diff --git a/app/controllers/admin/emailers_controller.rb b/app/controllers/admin/emailers_controller.rb index ae031aa..36d05b4 100644 --- a/app/controllers/admin/emailers_controller.rb +++ b/app/controllers/admin/emailers_controller.rb @@ -1,7 +1,8 @@ class Admin::EmailersController < OrbitAdminController - + include Admin::EmailersHelper + before_action :load_access_level def index - @table_fields = ["emailer.mail_subject", "emailer.delivery_date", "emailer.created_by", "emailer.status"] + @table_fields = [:category, "emailer.mail_subject", "emailer.delivery_date", "emailer.created_by", "emailer.status"] @emails = EmailEntry.all.order(sort) @emails = search_data(@emails,[:mail_subject]).page(params[:page]).per(10) if request.xhr? diff --git a/app/helpers/admin/emailers_helper.rb b/app/helpers/admin/emailers_helper.rb new file mode 100644 index 0000000..b17c8aa --- /dev/null +++ b/app/helpers/admin/emailers_helper.rb @@ -0,0 +1,24 @@ +module Admin::EmailersHelper + + def load_access_level + if (current_user.is_admin? rescue false) + @access_level = "admin" + elsif (current_user.is_manager?(@module_app) rescue false) + @access_level = "manager" + else + @access_level = "users" + end + end + + def user_can_approve? + case @access_level + when "admin" + return true + when "manager" + return true + else + return false + end + end + +end \ No newline at end of file diff --git a/app/helpers/emailer/application_helper.rb b/app/helpers/emailer/application_helper.rb deleted file mode 100644 index 57c8495..0000000 --- a/app/helpers/emailer/application_helper.rb +++ /dev/null @@ -1,4 +0,0 @@ -module Emailer - module ApplicationHelper - end -end diff --git a/app/models/email_entry.rb b/app/models/email_entry.rb index ff43d83..c10bc5b 100644 --- a/app/models/email_entry.rb +++ b/app/models/email_entry.rb @@ -1,7 +1,8 @@ class EmailEntry include Mongoid::Document include Mongoid::Timestamps - + include OrbitCategory::Categorizable + field :mail_subject #not optional field :mail_content #not optional field :create_user_id diff --git a/app/views/admin/emailers/_form.html.erb b/app/views/admin/emailers/_form.html.erb index 7db61fd..f730ac2 100644 --- a/app/views/admin/emailers/_form.html.erb +++ b/app/views/admin/emailers/_form.html.erb @@ -24,6 +24,13 @@