app/controllers/phcmemberspro/member/profiles_controller.rb in phcmemberspro-35.0.0 vs app/controllers/phcmemberspro/member/profiles_controller.rb in phcmemberspro-36.0.0

@@ -8,24 +8,24 @@
     before_action :set_paper_trail_whodunnit
     before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Member Profile
     def index
-      @member_profiles = Member::Profile.where(oganization_id: authrocket_membership_info.org_id)
+      @member_profiles = Member::Profile.where(org_id: current_user.org_id)
     end
 
     # DETAILED PROFILE - Member Profile
     def show
       @member_profile = Member::Profile.find(params[:id])
       @member_profile_versions = Phcmemberspro::ProfileVersions.where(item_id: @member_profile, item_type: 'Phcmemberspro::Member::Profile')
     end
 
     # NEW FORM - Member Profile
     def new
+      @member_profile = Member::Profile.new
       @member_profile.user_id = current_user.id
       @member_profile.org_id = current_user.org_id
-      @member_profile = Member::Profile.new
     end
 
     # EDIT FORM - Member Profile
     def edit
     end
@@ -66,10 +66,10 @@
       @member_profile = Member::Profile.find(params[:id])
     end
 
     # Whitelist
     def member_profile_params
-      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :slug, :user_id, :user_name, :membership_id, :oganization_id)
+      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :slug, :user_id, :org_id)
     end
 
   end
 end