Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into ydu

app/controllers/orbit_admin_controller.rb

@@ -78,6 +78,7 @@ class OrbitAdminController < ApplicationController
 
   def load_authorized_categories
     @user_authenticated_categories = current_user.is_admin? ? ["all"] : current_user.approved_categories.collect{|c| c.id} rescue []
+    @current_user_is_sub_manager = current_user.is_sub_manager?(@module_app) rescue false
   end
 
 

app/helpers/orbit_backend_helper.rb

@@ -138,8 +138,11 @@ module OrbitBackendHelper
   end
 
   def can_edit_or_delete?(obj)
+    create_user = obj.create_user_id.to_s rescue nil
     if @user_authenticated_categories.first == "all"
       return true
+    elsif @current_user_is_sub_manager && !create_user.nil?
+        create_user == current_user.id.to_s 
     else
       @user_authenticated_categories.include?obj.category_id rescue (current_user.is_manager?(@module_app) rescue false)
     end