phcdevworks_core_modules 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908084ab1bac324f935acc7efeef54a089a3d9075ea4cc89ff11efb18631f4f8
-  data.tar.gz: 03c8009534ec11c3902b4b050b8de1658a70790a1d8123f83b46e17728da8b2c
+  metadata.gz: 26a1d4b42d4f3a48e06cbb7b2dcfdc8a175af44eef7822c3a60ff431e9bb897f
+  data.tar.gz: f80048ced8e87031b052ba6207baabbd583d8dc85e4b00c0877f02faf2aa8b0f
 SHA512:
-  metadata.gz: 379ef906193a9e52ed336055bf172cceee8d891cafb050c84e59df13033d07c2a4787a2c895389d1cfcfb9e6c5962475cc0e052a3f3cb9c2cc53c9d0834fe6fd
-  data.tar.gz: 24ca974763484f3df0db89d8687aa1fcf65f65947c9bb0b32064287ff9a36690ff3df8caeb083078591e96ac4fe4dd350116ee30bb3f7df085701bd9f9a68531
+  metadata.gz: ee875e01eca345a2a0db7bcbf19bd2a122151fc57c092e004bc3750ff5bcc1a67689c29c0084c72a42bf48359a36182b798a6cffc94a19827a091ba8e00a1bee
+  data.tar.gz: 7665795363e0f55ba1f6d3250cfd330e393b71364cb2b5ddb6579d9aca9784e5b335e98e41d3248a8367ff8758ead188f51d0cdf236fc83b31baeaeba1ea48fd

data/app/controllers/phcdevworks_core_modules/post/categories_controller.rb

@@ -74,7 +74,7 @@ module PhcdevworksCoreModules
 
     # Whitelist
     def post_category_params
-      params.require(:post_category).permit(:category_name, :slug, :user_id, :org_id)
+      params.require(:post_category).permit(:category_name, :slug, :optimization_id, :user_id, :org_id)
     end
 
   end

data/app/models/phcdevworks_core_modules/marketing/optimization.rb

@@ -11,12 +11,27 @@ module PhcdevworksCoreModules
     # Paper Trail Initialize
     has_paper_trail :class_name => "PhcdevworksCoreModules::CoreOptimizationVersions"
 
-    # Relationships
+    # Relationships for Local
     belongs_to :user, class_name: "PhcdevworksAccounts::User"
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Article::Post", :join_table => "phcdevworks_press_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksPortfolio::Project::Post", :join_table => "phcdevworks_portfolio_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post", :join_table => "phcdevworks_tutorials_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Command::Post", :join_table => "phcdevworks_tutorials_categories_commands", :dependent => :destroy
+    has_many :categories, class_name: "PhcdevworksCoreModules::Post::Category"
+    
+    # Relationships for PHCDevworks Plugins
+    if defined?phcdevworks_members
+      has_many :listings, class_name: "PhcdevworksMembers::Member::Listing"
+    end
+    if defined?phcdevworks_scripts
+      has_many :listings, class_name: "PhcdevworksScripts::Script::Listing"
+    end
+    if defined?phcdevworks_press
+      has_many :posts, class_name: "PhcdevworksPress::Article::Post"
+    end
+    if defined?phcdevworks_portfolio
+      has_many :posts, class_name: "PhcdevworksPortfolio::Project::Post"
+    end
+    if defined?phcdevworks_tutorials
+      has_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post"
+      has_many :posts, class_name: "PhcdevworksTutorials::Command::Post"
+    end
 
     # Form Fields Validation
     validates :seo_title,

data/app/models/phcdevworks_core_modules/post/category.rb

@@ -11,13 +11,21 @@ module PhcdevworksCoreModules
     # Paper Trail Initialize
     has_paper_trail :class_name => "PhcdevworksCoreModules::CoreCategoryVersions"
 
-    # Relationships
+    # Relationships for Local
     belongs_to :user, class_name: "PhcdevworksAccounts::User"
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Article::Post", :join_table => "phcdevworks_press_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksPortfolio::Project::Post", :join_table => "phcdevworks_portfolio_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post", :join_table => "phcdevworks_tutorials_categories_posts", :dependent => :destroy
-    has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Command::Post", :join_table => "phcdevworks_tutorials_categories_commands", :dependent => :destroy
-    has_and_belongs_to_many :optimizations, class_name: 'PhcdevworksCoreModules::Core::Optimization', :join_table => "phcdevworks_core_modules_categories_optimizations", :dependent => :destroy
+    belongs_to :optimization, class_name: "PhcdevworksCoreModules::Marketing::Optimization", optional: true
+
+    # Relationships for PHCDevworks Plugins
+    if defined?phcdevworks_press
+      has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Article::Post", :join_table => "phcdevworks_press_categories_posts", :dependent => :destroy
+    end
+    if defined?phcdevworks_portfolio
+      has_and_belongs_to_many :posts, class_name: "PhcdevworksPortfolio::Project::Post", :join_table => "phcdevworks_portfolio_categories_posts", :dependent => :destroy
+    end
+    if defined?phcdevworks_tutorials
+      has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post", :join_table => "phcdevworks_tutorials_categories_posts", :dependent => :destroy
+      has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Command::Post", :join_table => "phcdevworks_tutorials_categories_commands", :dependent => :destroy
+    end
 
     # Form Fields Validation
     validates :category_name,

data/app/views/phcdevworks_core_modules/post/categories/_form.html.erb

@@ -10,6 +10,11 @@
         <%= form.label :category_name, "Category Name" %>
         <%= form.text_field :category_name, class: "form-control" %>
     </div>
+    
+	<div class="form-group">
+		<label>Attach SEO Data</label>
+		<%= collection_select(:post_category, :optimization_id, PhcdevworksCoreModules::Marketing::Optimization.order("seo_title"), :id, :seo_title, {}, {class: "form-control"}) %>
+	</div>
     <!-- Form Input Fields -->
 
     <!-- Form Submition Button -->

data/db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb

@@ -18,6 +18,7 @@ class CreatePhcdevworksCoreModulesMarketingOptimizations < ActiveRecord::Migrati
       t.string :slug
       t.string :user_id
       t.string :org_id
+
       t.timestamps
 
     end

data/db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb

@@ -8,6 +8,8 @@ class CreatePhcdevworksCoreModulesPostCategories < ActiveRecord::Migration[6.0]
       t.string :user_id
       t.string :org_id
 
+      t.string :optimization_id
+
       t.timestamps
 
     end

data/lib/phcdevworks_core_modules/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksCoreModules
-    VERSION = '2.0.1'
+    VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_core_modules
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -306,7 +306,6 @@ files:
 - db/migrate/20170517064427_create_phcdevworks_core_modules_category_versions.rb
 - db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb
 - db/migrate/20200705225433_create_phcdevworks_core_modules_optimization_versions.rb
-- db/migrate/20200706091346_create_phcdevworks_core_modules_categories_optimizations.rb
 - db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb
 - lib/phcdevworks_core_modules.rb
 - lib/phcdevworks_core_modules/engine.rb

data/db/migrate/20200706091346_create_phcdevworks_core_modules_categories_optimizations.rb

@@ -1,10 +0,0 @@
-class CreatePhcdevworksCoreModulesCategoriesOptimizations < ActiveRecord::Migration[6.0]
-  def change
-    create_table :phcdevworks_core_modules_categories_optimizations do |t|
-
-      t.integer :category_id
-      t.integer :optimization_id
-
-    end
-  end
-end