phcpress 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc269366d81527369f7b9587a583cda84c973f8
-  data.tar.gz: 594aeff4503c50fabe4ce714c61c03b88c994229
+  metadata.gz: 4d04bf361b222a9d32f8e4b2e5fe0fd97d159d50
+  data.tar.gz: 06a8c08d9edd60dd09d971b179e7f669c8f0df02
 SHA512:
-  metadata.gz: de9aeece950c6456fc9c797151a071bec57a50de375468b8a5654af7d5f0064a63e51856a4d01ee40aafae3a039558f1107ce5fd60f87d8ed91755861694f201
-  data.tar.gz: 8b25b3934796402f5bc18cb4590f159f2f2e239637560395f6f1ef879c1c42b9b904cd75f3b1b16dd322ba513d66260fdd560935715705fe303a73af5ed8394a
+  metadata.gz: a992ee118f81c11082f216ad6d9cffe558eed417bf8fbd5f8717f9f201196e38e828f7c549165f76bb49a2fe569385d54d85c8ec71c0830abec7c303c415abc8
+  data.tar.gz: b116d78dbdabdbe8973f05e8f7dfe32527a13d4be9e76ff0617f4997617125fc84ab345ba262b20b399116960134ee9d9ff4e7baec00e5667bfb2db4bd857a70

data/app/controllers/phcpress/articles/posts_controller.rb

@@ -18,7 +18,6 @@ module Phcpress
 		# Article New
 		def new
 			@articles_post = Articles::Post.new
-
 		end
 
 		# Article Edit

data/app/controllers/phcpress/modules/connections_controller.rb

@@ -52,12 +52,12 @@ module Phcpress
 
 		private
 
-		# Use callbacks to share common setup or constraints between actions.
+		# Common Callbacks
 		def set_modules_connection
 			@modules_connection = Modules::Connection.find(params[:id])
 		end
 
-		# Only allow a trusted parameter "white list" through.
+		# Whitelist
 		def modules_connection_params
 			params.require(:modules_connection).permit(:post_id, :category_id)
 		end

data/app/models/phcpress/articles/post.rb

@@ -5,8 +5,8 @@ module Phcpress
 		mount_uploader :pstimage, Phcpress::PstimageUploader
 		
 		# Relationships
-		has_many :connections, class_name: 'Modules::Connection'
-		has_many :categories, class_name: 'Modules::Category', :through => :connections
+		has_many :connections, class_name: 'Phcpress::Modules::Connection', dependent: :destroy
+		has_many :categories, class_name: 'Phcpress::Modules::Category', :through => :connections
 
 	end
 end

data/app/models/phcpress/modules/category.rb

@@ -2,8 +2,8 @@ module Phcpress
 	class Modules::Category < ApplicationRecord
 
 		# Relationships
-		has_many :connections, class_name: 'Modules::Connection'
-		has_many :posts, class_name: 'Modules::Category', :through => :connections
+		has_many :connections, class_name: 'Phcpress::Modules::Connection', dependent: :destroy
+		has_many :posts, class_name: 'Phcpress::Modules::Category', :through => :connections
 
 	end
 end

data/app/models/phcpress/modules/connection.rb

@@ -2,8 +2,8 @@ module Phcpress
 	class Modules::Connection < ApplicationRecord
 
 		# Relationships
-		belongs_to :post, class_name: 'Articles::Post'
-		belongs_to :category, class_name: 'Modules::Category'
+		belongs_to :post, class_name: 'Phcpress::Articles::Post'
+		belongs_to :category, class_name: 'Phcpress::Modules::Category'
 
 	end
 end

data/app/views/phcpress/articles/posts/_form.html.erb

@@ -31,7 +31,7 @@
 						<%= f.file_field :pstimage, class: "form-control" %>
 					</div>
 					<% if f.object.pstimage? %>
-						<%= image_tag f.object.pstimage, class: "img-responsive img-thumbnail" %>
+						<%= image_tag f.object.pstimage_url, class: "img-responsive img-thumbnail" %>
 						<%= f.label :remove_pstimage %>
 						<%= f.check_box :remove_pstimage %>
 					<% end %>

data/app/views/phcpress/articles/posts/edit.html.erb

@@ -1,2 +1 @@
-<!-- Main Form -->
-<%= render 'form' %>
+<%= render 'form', articles_post: @articles_post %>

data/app/views/phcpress/articles/posts/index.html.erb

@@ -36,7 +36,8 @@
 			</table>
 
 			<%= link_to 'New Blog Post', new_articles_post_path, class: "btn btn-primary" %>
+
 		</div>
 
 	</div>
-</div>
+</div>

data/app/views/phcpress/articles/posts/new.html.erb

@@ -1,2 +1 @@
-<!-- Main From -->
-<%= render 'form' %>
+<%= render 'form', articles_post: @articles_post %>

data/app/views/phcpress/modules/categories/_form.html.erb

@@ -1,9 +1,7 @@
 <div class="row">
 	<div class="col-lg-12">
-		<%= form_for(@modules_category) do |f| %>
 
-			<!-- PHC-Notifi Render Validation -->
-			<%= render 'phcnotifi/validations', :object => @modules_category %>
+		<%= form_for(@modules_category) do |f| %>
 
 			<div class="form-group">
 				<label><%= f.label :catname, "Category Name" %></label>
@@ -15,5 +13,6 @@
 			</div>
 
 		<% end %>
+
 	</div>
 </div>

data/app/views/phcpress/modules/categories/edit.html.erb

@@ -1,12 +1 @@
-<!-- Main Content -->
-<div class="panel panel-primary">
-
-	<div class="panel-heading">
-		<i class="fa fa-list-ul"></i> Edit Category
-	</div>
-
-	<div class="panel-body">
-		<%= render 'form' %>
-	</div>
-
-</div>
+<%= render 'form', modules_category: @modules_category %>

data/app/views/phcpress/modules/categories/index.html.erb

@@ -21,7 +21,7 @@
 						<tr>
 							<td><%= modules_category.catname %></td>
         					<td><div class="btn-group" role="group" aria-label="Blog Articles">
-								<%= link_to 'Edit', edit_modules_category_path(modules_category) , class: "btn btn-primary btn-xs" %>
+								<%= link_to 'Edit', edit_modules_category_path(modules_category), class: "btn btn-primary btn-xs" %>
 								<%= link_to 'Trash', modules_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
 								</div>
 							</td>
@@ -29,7 +29,9 @@
 					<% end %>
 				</tbody>
 			</table>
+
 			<%= link_to 'New Category', new_modules_category_path, class: "btn btn-primary" %>
+
 		</div>
 
 	</div>

data/app/views/phcpress/modules/categories/new.html.erb

@@ -1,12 +1 @@
-<!-- Main Content -->
-<div class="panel panel-primary">
-
-	<div class="panel-heading">
-		<i class="fa fa-list-ul"></i> New Category
-	</div>
-
-	<div class="panel-body">
-		<%= render 'form' %>
-	</div>
-
-</div>
+<%= render 'form', modules_category: @modules_category %>

data/app/views/phcpress/modules/connections/_form.html.erb

@@ -1,27 +1,23 @@
-<%= form_for(modules_connection) do |f| %>
-  <% if modules_connection.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(modules_connection.errors.count, "error") %> prohibited this modules_connection from being saved:</h2>
+<div class="row">
+	<div class="col-lg-12">
 
-      <ul>
-      <% modules_connection.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+		<%= form_for(@modules_connection) do |f| %>
 
-  <div class="field">
-    <%= f.label :post_id %>
-    <%= f.text_field :post_id %>
-  </div>
+			<div class="form-group">
+				<%= f.label :category_id, "Category ID" %>
+				<%= f.text_field :category_id, class: "form-control" %>
+			</div>
 
-  <div class="field">
-    <%= f.label :category_id %>
-    <%= f.text_field :category_id %>
-  </div>
+			<div class="form-group">
+				<%= f.label :post_id, "Post ID" %>
+				<%= f.text_field :post_id, class: "form-control" %>
+			</div>
 
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
+			<div class="actions">
+				<%= f.submit "Submit", class: "btn btn-primary" %>
+			</div>
+
+		<% end %>
+
+	</div>
+</div>

data/app/views/phcpress/modules/connections/edit.html.erb

@@ -1,6 +1 @@
-<h1>Editing Modules Connection</h1>
-
 <%= render 'form', modules_connection: @modules_connection %>
-
-<%= link_to 'Show', @modules_connection %> |
-<%= link_to 'Back', modules_connections_path %>

data/app/views/phcpress/modules/connections/index.html.erb

@@ -1,29 +1,38 @@
-<p id="notice"><%= notice %></p>
+<!-- Main Content -->
+<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
 
-<h1>Modules Connections</h1>
+		<div class="panel-heading">
+			<i class="fa fa-list-ul"></i> Connections List
+		</div>
 
-<table>
-  <thead>
-    <tr>
-      <th>Post</th>
-      <th>Category</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
+		<div class="panel-body">
 
-  <tbody>
-    <% @modules_connections.each do |modules_connection| %>
-      <tr>
-        <td><%= modules_connection.post %></td>
-        <td><%= modules_connection.category %></td>
-        <td><%= link_to 'Show', modules_connection %></td>
-        <td><%= link_to 'Edit', edit_modules_connection_path(modules_connection) %></td>
-        <td><%= link_to 'Destroy', modules_connection, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>Category</th>
+						<th>Posts</th>
+						<th colspan="3"></th>
+					</tr>
+				</thead>
 
-<br>
+				<tbody>
+					<% @modules_connections.each do |modules_connection| %>
+						<tr>
+							<td><%= modules_connection.category.catname %></td>
+							<td><%= modules_connection.post.psttitle %></td>
+							<td><%= link_to 'Show', modules_connection, class: "btn btn-primary btn-xs" %></td>
+							<td><%= link_to 'Edit', edit_modules_connection_path(modules_connection), class: "btn btn-primary btn-xs" %></td>
+							<td><%= link_to 'Destroy', modules_connection, class: "btn btn-primary btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %></td>
+						</tr>
+					<% end %>
+				</tbody>
+			</table>
 
-<%= link_to 'New Modules Connection', new_modules_connection_path %>
+			<%= link_to 'New Connection', new_modules_connection_path, class: "btn btn-primary" %>
+
+		</div>
+
+	</div>
+</div>

data/app/views/phcpress/modules/connections/new.html.erb

@@ -1,5 +1 @@
-<h1>New Modules Connection</h1>
-
 <%= render 'form', modules_connection: @modules_connection %>
-
-<%= link_to 'Back', modules_connections_path %>

data/app/views/phcpress/modules/connections/show.html.erb

@@ -2,12 +2,12 @@
 
 <p>
   <strong>Post:</strong>
-  <%= @modules_connection.post %>
+  <%= @modules_connection.post_id %>
 </p>
 
 <p>
   <strong>Category:</strong>
-  <%= @modules_connection.category %>
+  <%= @modules_connection.category_id %>
 </p>
 
 <%= link_to 'Edit', edit_modules_connection_path(@modules_connection) %> |

data/config/routes.rb

@@ -2,13 +2,13 @@ Phcpress::Engine.routes.draw do
 
 	# Article Routes
 	namespace :articles do
-		resources :posts, class_name: 'Articles::Post'
+		resources :posts, class_name: 'Phcpress::Articles::Post'
 	end
 
 	# Module Routes
 	namespace :modules do
-		resources :connections, class_name: 'Modules::Connection'
-		resources :categories, class_name: 'Modules::Category'
+		resources :connections, class_name: 'Phcpress::Modules::Connection'
+		resources :categories, class_name: 'Phcpress::Modules::Category'
 	end
 
 end

data/db/migrate/20160720235314_create_phcpress_modules_connections.rb

@@ -1,10 +1,12 @@
 class CreatePhcpressModulesConnections < ActiveRecord::Migration[5.0]
-  def change
-    create_table :phcpress_modules_connections do |t|
-      t.references :post, foreign_key: true
-      t.references :category, foreign_key: true
+	def change
+		create_table :phcpress_modules_connections do |t|
 
-      t.timestamps
-    end
-  end
+			t.references :post
+			t.references :category
+
+			t.timestamps
+
+		end
+	end
 end

data/lib/phcpress/version.rb

@@ -1,3 +1,3 @@
 module Phcpress
-    VERSION = "5.0.0"
+    VERSION = "5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcpress
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails