phcscriptcdnpro 72.2.0 → 73.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435f8aaf0cf66507576a2e18f49235370e162b49f866f5a4e6c51581e16c11aa
-  data.tar.gz: aeae3724f3024383798ea522a44891fb39613be9b2a50bbcb4c0196136c8be99
+  metadata.gz: 2aeafb460622321c00bee73a05baeb0c6d3913ccf23905116bb7786e5958020f
+  data.tar.gz: dd9482caba24597d6004cc32293b1a7708ec0771e7ac6d00929825195f7386df
 SHA512:
-  metadata.gz: 79068fa05eebbee1a333cd99fa32524ae7319c3428ef0d0b7f0b6d32fa914057ce92bfacef5f545ddf43557cb4002ca01f48fa61146d6247bd82f4e30e6c30ee
-  data.tar.gz: e6e27e4e7edf82e9847dd6cf8134182208d375963d0d327c86b808fc9ba315a9a94a03e08465070dc99b4b3ed47213b9f7194ff8f5039389f5335c7b8741ea32
+  metadata.gz: b56ff83cb90e06418572ad03414f52fb9f45ea1941685d6ff8985b5f2ffcade2aca7ff87b0918e374fe7d21e3730fdb525cd5c78f08d4107eec8269a80fc8f8d
+  data.tar.gz: ceab28cfb68ef4a92f02c94798e23e14a2b92ac1b3db094e97eed52db308cd9d303d79ba02ccdc91c756ce7228cedb98c2c7776d31b800504147a6c998e5afcd

data/app/controllers/phcscriptcdnpro/application_controller.rb

@@ -1,22 +1,27 @@
 module Phcscriptcdnpro
     class ApplicationController < ActionController::Base
-    
+
         # Security Filters
         protect_from_forgery with: :exception
-    
+        before_action :set_default_locale
+
         # Load Requried Helper Files
         helper Phccorehelpers::Engine.helpers
         helper Phcmenus::Engine.helpers
         helper Phctitleseo::Engine.helpers
         helper Phcnotifi::Engine.helpers
         helper Phcaccountspro::Engine.helpers
-    
+
         # Papertrail Whodunnit Username
         def user_for_paper_trail
           current_user ? current_user.username : 'Public user'
         end
-    
+
         private
-    
+
+        def set_default_locale
+            I18n.default_locale = :en
+        end
+
     end
 end

data/app/controllers/phcscriptcdnpro/script/authors_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::AuthorsController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_author, only: [:show, :edit, :update, :destroy]
 
@@ -18,14 +17,12 @@ module Phcscriptcdnpro
     # DETAILS - Script Author
     def show
       @script_authors = Script::Author.friendly.find(params[:id])
-      @versions = Phcscriptcdnpro::AuthorVersion.where(item_id: params[:id], item_type: 'Phcscriptcdnpro::Script::Author')
+      @versions = Phcscriptcdnpro::AuthorVersions.where(item_id: params[:id], item_type: 'Phcscriptcdnpro::Script::Author')
     end
 
     # NEW - Script Author
     def new
       @script_author = Script::Author.new
-      @script_author.user_id = current_user.id
-      @script_author.org_id = current_user.org_id
     end
 
     # EDIT - Script Author
@@ -46,8 +43,6 @@ module Phcscriptcdnpro
 
     # PATCH/PUT - Script Author
     def update
-      @script_author.user_id = current_user.id
-      @script_author.org_id = current_user.org_id
       if @script_author.update(script_author_params)
           redirect_to script_authors_url, notice: 'Author was successfully updated.'
           else
@@ -70,7 +65,7 @@ module Phcscriptcdnpro
 
     # Whitelist
     def script_author_params
-      params.require(:script_author).permit(:authorfirstname, :authorlastname, :authorwebsite, :authorgithub, :authortwitter, :slug, :user_id, :org_id)
+      params.require(:script_author).permit(:author_first_name, :author_last_name, :author_website, :author_github, :slug, :user_id, :org_id, :listing_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/extensions_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::ExtensionsController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_extension, only: [:show, :edit, :update, :destroy]
 
@@ -24,8 +23,6 @@ module Phcscriptcdnpro
     # NEW - Script Extension
     def new
       @script_extension = Script::Extension.new
-      @script_extension.user_id = current_user.id
-      @script_extension.org_id = current_user.org_id
     end
 
     # EDIT - Script Extension
@@ -46,8 +43,6 @@ module Phcscriptcdnpro
 
     # PATCH/PUT - Script Extension
     def update
-      @script_extension.user_id = current_user.id
-      @script_extension.org_id = current_user.org_id
       if @script_extension.update(script_extension_params)
         redirect_to script_extensions_url, notice: 'Extension was successfully updated.'
         else
@@ -57,7 +52,7 @@ module Phcscriptcdnpro
 
     # DELETE - Script Extension
     def destroy
-    @script_extension.destroy
+      @script_extension.destroy
       redirect_to script_extensions_url, notice: 'Extension was successfully destroyed.'
     end
 
@@ -70,7 +65,7 @@ module Phcscriptcdnpro
 
     # Whitelists
     def script_extension_params
-      params.require(:script_extension).permit(:scriptextensionname, :scriptextensiondes, :scriptextension, :slug, :user_id, :org_id)
+      params.require(:script_extension).permit(:script_extension_name, :script_extension_description, :script_extension, :slug, :user_id, :org_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/licences_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::LicencesController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_licence, only: [:show, :edit, :update, :destroy]
 
@@ -24,8 +23,6 @@ module Phcscriptcdnpro
     # 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
@@ -46,8 +43,6 @@ module Phcscriptcdnpro
 
     # 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
@@ -70,7 +65,7 @@ module Phcscriptcdnpro
 
     # Whitelists
     def script_licence_params
-      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :org_id)
+      params.require(:script_licence).permit(:licence_name, :licence_description, :licence_compatible_gpl, :licence_approval_fsf, :licence_approval_osi, :licence_approval_copyfree, :licence_approval_debian, :licence_approval_fedora, :slug, :user_id, :org_id, :listing_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/listings_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::ListingsController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_listing, only: [:show, :edit, :update, :destroy]
 
@@ -18,14 +17,12 @@ module Phcscriptcdnpro
     # DETAILS - Script Listings
     def show
       @script_listings = Script::Listing.friendly.find(params[:id])
-      @versions = Phcscriptcdnpro::ListingVersions.where(item_id: params[:id], item_type: 'Phcscriptcdnpro::Script::Listing')
+      @versions = Phcscriptcdnpro::ListingVersions.where(item_id: params[:id], item_type: 'Phcscriptcdnpro::Script_::Listing')
     end
 
     # NEW - Script Listings
     def new
       @script_listing = Script::Listing.new
-      @script_listing.user_id = current_user.id
-      @script_listing.org_id = current_user.org_id
     end
 
     # EDIT - Script Listings
@@ -39,15 +36,13 @@ module Phcscriptcdnpro
       @script_listing.org_id = current_user.org_id
       if @script_listing.save
         redirect_to script_listings_path, notice: 'Listing was successfully created.'
-        else
-          render :new
+      else
+        render :new
       end
     end
 
     # PATCH/PUT - Script Listings
     def update
-      @script_listing.user_id = current_user.id
-      @script_listing.org_id = current_user.org_id
       if @script_listing.update(script_listing_params)
         redirect_to script_listings_path, notice: 'Listing was successfully updated.'
       else
@@ -70,7 +65,7 @@ module Phcscriptcdnpro
 
     # Whitelist
     def script_listing_params
-      params.require(:script_listing).permit(:scripttitle, :scriptdescription, :descriptionsource, :scriptwebsite, :scripttwitter, :scriptgithub, :scriptinitialrelease, :scriptlastestrelease, :scriptbetarelease, :scriptstatus, :slug, :user_id, :org_id, :version_id, :author_id, :licence_id)
+      params.require(:script_listing).permit(:script_tittle, :script_description, :script_source, :script_website, :script_github, :script_initial_release, :script_lastest_release, :script_beta_release, :script_lastest_release_cdn, :script_status, :slug, :user_id, :org_id, :version_id, :author_id, :licence_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/urls_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::UrlsController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_url, only: [:show, :edit, :update, :destroy]
 
@@ -26,8 +25,6 @@ module Phcscriptcdnpro
     def new
       script_listing = Script::Listing.find(params[:listing_id])
       @script_url = script_listing.urls.build
-      @script_url.user_id = current_user.id
-      @script_url.org_id = current_user.org_id
     end
 
     # EDIT - Script Athors
@@ -51,8 +48,6 @@ module Phcscriptcdnpro
 
     # PATCH/PUT - Script Athors
     def update
-      @script_url.user_id = current_user.id
-      @script_url.org_id = current_user.org_id
       if @script_url.update(script_url_params)
         redirect_to script_listing_urls_path, notice: 'Author was successfully updated.'
         else
@@ -77,7 +72,7 @@ module Phcscriptcdnpro
 
     # Whitelists
     def script_url_params
-      params.require(:script_url).permit(:scripturl, :scripturlrelease, :scripturlcdnupdate, :slug, :user_id, :org_id, :listing_id, :version_id, :extension_id)
+      params.require(:script_url).permit(:script_url, :script_url_release, :script_url_cdn_update, :slug, :user_id, :org_id, :listing_id, :version_id, :extension_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/versions_controller.rb

@@ -4,9 +4,8 @@ module Phcscriptcdnpro
   class Script::VersionsController < ApplicationController
 
     # Include Core Helpers, Security & Action Filters
-    include Phccorehelpers::ApplicationHelper
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
-    before_action :phc_accounts_pro_admin_only
     before_action :set_paper_trail_whodunnit
     before_action :set_script_version, only: [:show, :edit, :update, :destroy]
 
@@ -70,7 +69,7 @@ module Phcscriptcdnpro
 
     # Only allow a trusted parameter "white list" through.
     def script_version_params
-      params.require(:script_version).permit(:scriptversion, :slug, :user_id, :org_id)
+      params.require(:script_version).permit(:script_version_number, :slug, :user_id, :org_id)
     end
 
   end

data/app/helpers/phcscriptcdnpro/application_helper.rb

@@ -1,14 +1,4 @@
 module Phcscriptcdnpro
   module ApplicationHelper
-
-    # Add Active to Menu
-    def is_active_controller(controller_name)
-      params[:controller] == controller_name ? "active open selected" : nil
-    end
-
-    def is_active_action(action_name)
-      params[:action] == action_name ? "active" : nil
-    end
-
   end
 end

data/app/models/phcscriptcdnpro/script/author.rb

@@ -16,7 +16,7 @@ module Phcscriptcdnpro
     # Define for Multiple Records
     def phcscriptcdnpro_author_slug
       [
-        [:authorfirstname, :authorlastname]
+        [:author_first_name, :author_last_name]
       ]
     end
 

data/app/models/phcscriptcdnpro/script/extension.rb

@@ -12,13 +12,13 @@ module Phcscriptcdnpro
     has_many :urls, class_name: 'Phcscriptcdnpro::Script::Url'
 
     # Validation for Form Fields
-    validates :scriptextensionname,
+    validates :script_extension_name,
       presence: true
 
-    validates :scriptextensiondes,
+    validates :script_extension_description,
       presence: true
 
-    validates :scriptextension,
+    validates :script_extension,
       presence: true
 
     # Clean URL Define
@@ -27,7 +27,7 @@ module Phcscriptcdnpro
     # Define for Multiple Records
     def phcscriptcdnpro_extentension_slug
       [
-        [:scriptextensionname, :scriptextension]
+        [:script_extension]
       ]
     end
 

data/app/models/phcscriptcdnpro/script/licence.rb

@@ -11,10 +11,10 @@ module Phcscriptcdnpro
     has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing'
 
     # Validation for Form Fields
-    validates :lcncname,
+    validates :licence_name,
       presence: true
 
-    validates :lcncdescript,
+    validates :licence_description,
       presence: true
 
     # Clean URL Define
@@ -23,7 +23,7 @@ module Phcscriptcdnpro
     # Define for Multiple Records
     def phcscriptcdnpro_licence_slug
       [
-        [:lcncname]
+        [:licence_name]
       ]
     end
 

data/app/models/phcscriptcdnpro/script/listing.rb

@@ -10,16 +10,33 @@ module Phcscriptcdnpro
     # Relationships
     has_many :urls, class_name: 'Phcscriptcdnpro::Script::Url'
     belongs_to :author, class_name: 'Phcscriptcdnpro::Script::Author'
-    belongs_to :version, class_name: 'Phcscriptcdnpro::Script::Version'
     belongs_to :licence, class_name: 'Phcscriptcdnpro::Script::Licence'
 
+    # Validation for Form Fields
+    validates :script_tittle,
+      presence: true,
+      length: { minimum: 3 }
+
+    validates :script_description,
+      presence: true,
+      length: { minimum: 4 }
+
+    validates :script_source,
+      length: { minimum: 5 }
+
+     validates :script_website,
+      length: { minimum: 5 }
+
+    validates :script_github,
+      length: { minimum: 5 }
+
     # Clean URL Define
     friendly_id :phcscriptcdnpro_listing_slug, use: [:slugged, :finders]
 
     # Define for Multiple Records
     def phcscriptcdnpro_listing_slug
       [
-        [:scripttitle]
+        [:script_tittle, :version]
       ]
     end
 

data/app/models/phcscriptcdnpro/script/url.rb

@@ -9,17 +9,17 @@ module Phcscriptcdnpro
 
     # Relationships
     belongs_to :listing, class_name: 'Phcscriptcdnpro::Script::Listing'
-    belongs_to :version, class_name: 'Phcscriptcdnpro::Script::Version'
     belongs_to :extension, class_name: 'Phcscriptcdnpro::Script::Extension'
+    belongs_to :version, class_name: 'Phcscriptcdnpro::Script::Version', optional: true
 
     # Validation for Form Fields
-    validates :scripturl,
+    validates :script_url,
       presence: true
 
-    validates :scripturlrelease,
+    validates :script_url_release,
       presence: true
 
-    validates :scripturlcdnupdate,
+    validates :script_url_cdn_update,
       presence: true
 
     # Clean URL Define
@@ -28,7 +28,7 @@ module Phcscriptcdnpro
     # Define for Multiple Records
     def phcscriptcdnpro_url_slug
       [
-        [:scripturl]
+        [:id]
       ]
     end
 

data/app/models/phcscriptcdnpro/script/version.rb

@@ -8,11 +8,11 @@ module Phcscriptcdnpro
     has_paper_trail :class_name => 'Phcscriptcdnpro::ScriptversionVersions'
 
     # Relationships
-    has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing'
+    has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing', :through => :urls
     has_many :urls, class_name: 'Phcscriptcdnpro::Script::Url'
 
     # Validation for Form Fields
-    validates :scriptversion,
+    validates :script_version_number,
     presence: true
 
     # Clean URL Define
@@ -21,7 +21,7 @@ module Phcscriptcdnpro
     # Define for Multiple Records
     def phcscriptcdnpro_version_slug
       [
-        [:scriptversion]
+        [:script_version_number]
       ]
     end