forgeos_core 1.9.1 → 1.9.2

data/app/controllers/admin/rights_controller.rb

@@ -55,15 +55,15 @@ class Admin::RightsController < Admin::BaseController
   def destroy
     if @right.destroy
       flash[:notice] = I18n.t('right.destroy.success').capitalize
-      return request.xhr? ? (render :nothing => true) : redirect_to([forgeos_core, :admin, :rights])
     else
       flash[:error] = I18n.t('right.destroy.failed').capitalize
-      if request.xhr?
-        render :nothing => true, :json => { :result => 'error' }
-        return false
-      else
+    end
+
+    respond_to do |wants|
+      wants.html do
         redirect_to([forgeos_core, :admin, :rights])
       end
+      wants.js
     end
   end
 
@@ -81,7 +81,7 @@ private
     per_page = params[:iDisplayLength].to_i
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
-    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/roles_controller.rb

@@ -51,7 +51,12 @@ class Admin::RolesController < Admin::BaseController
     else
       flash[:error] = I18n.t('role.destroy.failed').capitalize
     end
-    return redirect_to([forgeos_core,:admin,:roles])
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_core,:admin,:roles])
+      end
+      wants.js
+    end
   end
 
   def rights
@@ -64,7 +69,7 @@ class Admin::RolesController < Admin::BaseController
   end
 
   def activate
-    render :text => @role.activate
+    @role.activate
   end
 
 private
@@ -86,7 +91,7 @@ private
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
     order_column = params[:iSortCol_0].to_i
-    order = "#{columns[order_column]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[order_column]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/users_controller.rb

@@ -48,7 +48,12 @@ class Admin::UsersController < Admin::BaseController
     else
       flash[:error] = I18n.t('user.destroy.failed').capitalize
     end
-    return redirect_to([forgeos_core, :admin, :users])
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_core, :admin, :users])
+      end
+      wants.js
+    end
   end
 
   def activate
@@ -65,10 +70,11 @@ class Admin::UsersController < Admin::BaseController
         flash[:error] = I18n.t('user.disactivation.failed').capitalize
       end
     end
-    if request.xhr?
-      render :nothing => true
-    else
-      return redirect_to(:back)
+    respond_to do |wants|
+      wants.html do
+        redirect_to(:back)
+      end
+      wants.js
     end
   end
 
@@ -173,7 +179,7 @@ private
     per_page = params[:iDisplayLength] ? params[:iDisplayLength].to_i : 10
     offset = params[:iDisplayStart] ? params[:iDisplayStart].to_i : 0
     page = (offset / per_page) + 1
-    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:iSortDir_0] ? params[:iSortDir_0].upcase : 'ASC'}"
+    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:sSortDir_0] ? params[:sSortDir_0].upcase : 'ASC'}"
 
     conditions = {}
     includes = []

data/app/controllers/forgeos/application_controller.rb

@@ -7,8 +7,7 @@ class Forgeos::ApplicationController < ActionController::Base
   def notifications
     @notifications = {}
     [:error, :notice, :warning].each do |key|
-      message = flash.delete(key)
-      @notifications[key] = message unless message.blank?
+      @notifications[key] = flash[key] unless flash[key].blank?
     end
     render :json => @notifications.to_json
   end