app/controllers/phcscriptcdn/script/licences_controller.rb in phcscriptcdn-48.0.0 vs app/controllers/phcscriptcdn/script/licences_controller.rb in phcscriptcdn-49.0.0

@@ -1,43 +1,54 @@
 require_dependency "phcscriptcdn/application_controller"
 
 module Phcscriptcdn
   class Script::LicencesController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_licence, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Licences
     def index
-      @script_licences = Script::Licence.all
+      @script_licences = Script::Licence.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Licences
     def show
+      @script_licences = Script::Licence.friendly.find(params[:id])
+      @versions = Phcscriptcdn::LicenceVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Licence')
     end
 
     # NEW - Script Licences
     def new
       @script_licence = Script::Licence.new
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
     end
 
     # EDIT - Script Licences
     def edit
     end
 
     # POST - Script Licences
     def create
       @script_licence = Script::Licence.new(script_licence_params)
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.save
         redirect_to script_licences_url, notice: 'Licence was successfully created.'
         else
-          render :new
+        render :new
       end
     end
 
     # PATCH/PUT - Script Licences
     def update
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.update(script_licence_params)
         redirect_to script_licences_url, notice: 'Licence was successfully updated.'
         else
           render :edit
       end
@@ -51,15 +62,15 @@
 
     private
 
     # Common Callbacks
     def set_script_licence
-      @script_licence = Script::Licence.find(params[:id])
+      @script_licence = Script::Licence.friendly.find(params[:id])
     end
 
     # Whitelists
     def script_licence_params
-      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :user_name)
+      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :org_id, :listing_id)
     end
 
   end
 end