authentication_helper.rb in usman-0.4.0.pre.materialize

- old
+ new

@@ -13,11 +13,11 @@
       @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
       @params_hsh[:requested_url] = request.original_url if request.get?
     end
 
     def permission_denied
-      render :file => "layouts/kuppayam/401", layout: 'layouts/kuppayam/blank_with_nav', :status => :unauthorized
+      render :file => "layouts/kuppayam/xenon/401", layout: 'layouts/kuppayam/xenon/blank_with_nav', :status => :unauthorized
     end
     
     # Returns the default URL to which the system should redirect the user after successful authentication
     def default_redirect_url_after_sign_in
       main_app.user_landing_url
@@ -114,10 +114,23 @@
         set_flash_message(text, :error, false) if defined?(flash) && flash
         redirect_or_popup_to_default_sign_in_page(false)
       end
     end
 
+    def require_role
+      return true if @current_user && @current_user.super_admin?
+      unless @current_user && @current_user.roles.any?
+        respond_to do |format|
+          format.html { permission_denied }
+          format.js {
+            set_params_hsh
+            render(:partial => 'usman/sessions/sign_in.js.erb', :handlers => [:erb], :formats => [:js])
+          }
+        end
+      end
+    end
+
     def require_site_admin
       return true if @current_user && @current_user.super_admin?
       unless @current_user && @current_user.has_role?("Site Admin")
         respond_to do |format|
           format.html { permission_denied }
@@ -184,11 +197,11 @@
         end
       end
     end
 
     def current_permission
-      feature_class = @resource_options[:feature_class] || @resource_options[:class]
-      @current_feature = Feature.published.find_by_name(feature_class)
+      feature_name = @resource_options[:feature_name] || @resource_options[:class]
+      @current_feature = Feature.published.find_by_name(feature_name)
       feature_id = @current_feature ? @current_feature.id : -1
       @current_permission = @current_user.permissions.where("feature_id = ?", feature_id).first
     end
 
     # -------------------