Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts:
	config/environments/development.rb

app/controllers/admin/app_auths_controller.rb

@@ -21,7 +21,10 @@ class Admin::AppAuthsController < ApplicationController
 
   def create
     app_auth = AppAuth.find_or_create_by(module_app_id: params[:module_app_id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    app_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
@@ -66,6 +69,8 @@ class Admin::AppAuthsController < ApplicationController
     @module_app = ModuleApp.find(params[:id])
   end
   
-  
+  def show
+    @module_app = ModuleApp.find(params[:id])
+  end
 
 end

app/controllers/admin/module_apps_controller.rb

@@ -21,6 +21,10 @@ class Admin::ModuleAppsController < ApplicationController
     @module_app = ModuleApp.find(params[:id])
   end
   
+  def show
+    @module_app = ModuleApp.find(params[:id])
+    
+  end
   
   def update
     @module_app = ModuleApp.find(params[:id])
@@ -97,7 +101,7 @@ class Admin::ModuleAppsController < ApplicationController
     end
       #user is not permited to do that
       flash[:notice] = t('admin.app_auth.operation_not_permitted')
-      redirect_to :action => "edit"   # [TODO] maybe need to redirect to some other page
+      render :nothing => true, :status => 403 
   end
   
   
@@ -109,7 +113,7 @@ class Admin::ModuleAppsController < ApplicationController
     end
       #user is not permited to do that
       flash[:notice] = t('admin.app_auth.operation_not_permitted')
-      redirect_to :action => "edit"   # [TODO] maybe need to redirect to some other page
+      render :nothing => true, :status => 403 
   end
   
 end

app/controllers/admin/object_auths_controller.rb

@@ -1,8 +1,12 @@
 class Admin::ObjectAuthsController < ApplicationController
+  include OrbitCoreLib::PermissionUnility
   layout "admin"
   before_filter :authenticate_user!
+  before_filter :check_if_user_can_do_object_auth
 #  before_filter :is_admin? ,:only => :index
   
+
+  
   def index
     # if current_user.admin?
       @object_auths = ObjectAuth.all
@@ -14,6 +18,7 @@ class Admin::ObjectAuthsController < ApplicationController
   def new
     obj = eval(params[:type]).find params[:obj_id]
     @object_auth=obj.object_auths.build
+    @object_auth_title_option = eval(params[:type]+"::ObjectAuthTitlesOptions")
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @post }
@@ -22,13 +27,21 @@ class Admin::ObjectAuthsController < ApplicationController
   
   def create
     obj = eval(params[:object_auth][:type]).find params[:object_auth][:obj_id]
-    @object_auth=obj.object_auths.create :title=> params[:object_auth][:title]
-    redirect_to edit_admin_object_auth_path(@object_auth)
+    @object_auth=obj.object_auths.build :title=> params[:object_auth][:title]
+    if @object_auth.save
+      redirect_to edit_admin_object_auth_path(@object_auth)
+    else
+      flash[:error] = t('admin.object.a_object_must_have_only_one_object_auth_profile_for_each_action')
+      redirect_to (:back)
+    end
   end
 
   def create_role
     object_auth = ObjectAuth.find(params[:id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    object_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
@@ -69,7 +82,11 @@ class Admin::ObjectAuthsController < ApplicationController
   def edit
     @object_auth = ObjectAuth.find(params[:id])
   end
-  
-
 
+private
+  def check_if_user_can_do_object_auth
+    unless  check_permission(:manager)
+      render :nothing => true, :status => 403 
+    end
+  end
 end

app/controllers/obit_frontend_controller.rb

@@ -1,3 +0,0 @@
-class ObitFrontendController< ObitFrontendComponentController
-
-end

app/controllers/obit_widget_controller.rb

@@ -1,3 +0,0 @@
-class ObitWidgetController< ObitFrontendComponentController
-
-end

app/controllers/orbit_backend_controller.rb

@@ -0,0 +1,23 @@
+class OrbitBackendController< ApplicationController
+  before_filter :authenticate_user!
+  before_filter :setup_vars
+ # before_filter {|c| c.front_end_available(@app_title)}
+  before_filter :check_user_can_use,:except => [:public]
+  include OrbitCoreLib::PermissionUnility
+  
+  layout 'admin'
+  
+  def setup_vars
+    @app_title = request.fullpath.split('/')[2]
+    @module_app = ModuleApp.first(conditions: {:key => @app_title} )
+  end
+  
+  private
+  
+  def check_user_can_use 
+    unless check_permission
+      redirect_to polymorphic_path(['panel',@app_title,'back_end','public'])
+    end
+  end
+  
+end

app/controllers/orbit_frontend_component_controller.rb

@@ -1,4 +1,4 @@
-class ObitFrontendComponentController< ApplicationController
+class OrbitFrontendComponentController< ApplicationController
   before_filter :setup_vars
   before_filter {|c| c.front_end_available(@app_title)}
   layout 'module_widget'

app/controllers/orbit_frontend_controller.rb

@@ -0,0 +1,3 @@
+class OrbitFrontendController< OrbitFrontendComponentController
+
+end

app/controllers/orbit_widget_controller.rb

@@ -0,0 +1,3 @@
+class ObitWidgetController< OrbitFrontendComponentController
+
+end