phcpress 3.7.0 → 3.7.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcpress/blog/posts_controller.rb +11 -17
  3. data/app/controllers/phcpress/categories_controller.rb +10 -10
  4. data/app/controllers/phcpress/news/posts_controller.rb +10 -16
  5. data/app/models/phcpress/blog/post.rb +1 -1
  6. data/app/models/phcpress/news/post.rb +2 -1
  7. data/app/views/phcpress/blog/posts/_form.html.erb +6 -2
  8. data/app/views/phcpress/categories/edit.html.erb +1 -1
  9. data/app/views/phcpress/categories/index.html.erb +1 -1
  10. data/app/views/phcpress/categories/new.html.erb +1 -1
  11. data/app/views/phcpress/news/posts/_form.html.erb +6 -2
  12. data/db/migrate/20160425194021_add_phcpress_category_to_phcpress_blog_posts.rb +7 -0
  13. data/db/migrate/20160425194321_add_phcpress_category_to_phcpress_news_post.rb +7 -0
  14. data/lib/phcpress/version.rb +1 -1
  15. metadata +14 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8d847b33ceb955f163672364bce714d6ccd8dc06
4
- data.tar.gz: ce77b4034bbf005a466f5e64e267b97011b1f8ab
3
+ metadata.gz: 19a87557ab3352bd6b46c50f9cba91e6bb666758
4
+ data.tar.gz: 0a4982252f0004e99f54cc6ef7f0a02696c7d3ac
5
5
  SHA512:
6
- metadata.gz: abf87639dae46734ddaf81caf4ec01c7d5904db292d31e54539129334ad5ae64d1d805f7c4def5cd62850d06418c7631d727076dbe766166bd2cabb30076486c
7
- data.tar.gz: ac25d819356234c29bd84ac53372abca71248fb026d6fa2547248149f149f11c9576709ffb9411bb2c46dc5ade0a978df3690a56ea668f3ce2bbeb6e1af7b2c1
6
+ metadata.gz: 7f3ea7e20d169d44c177e57ccbfbce0ee01b13d4ee52aa590e33c784c5753d8e4faabb034b4c2e9d44704a9a0d99ad4f9cac33a0c580effb142f217d11b8a1b2
7
+ data.tar.gz: e4db1e936318efe82e3c5c3b6086da3e281948fe4538679b81076daf5f5d7e111a2e70d896342b845f3212dc1bf6afe5c5f8fa8d0802c845efb9a5822b8457d5
data/app/controllers/phcpress/blog/posts_controller.rb CHANGED
@@ -1,7 +1,5 @@
1
- # Load General Controller for Engine
2
1
  require_dependency "phcpress/application_controller"
3
2
 
4
- # Code for News Posting
5
3
  module Phcpress
6
4
  class News::PostsController < ApplicationController
7
5
 
@@ -11,48 +9,44 @@ module Phcpress
11
9
  before_action :current_user
12
10
  before_action :set_news_post, only: [:edit, :update, :destroy]
13
11
 
14
- # News Post Index (/news/posts)
12
+ # Blog Post Index
15
13
  def index
16
14
  @news_posts = News::Post.all
17
15
  end
18
16
 
19
- # Single News Post (/news/posts/1)
20
- #def show
21
- #end
22
-
23
- # Create a New News Post (/news/posts/new)
17
+ # New Blog Article
24
18
  def new
25
19
  @news_post = News::Post.new
26
20
  end
27
21
 
28
- # Edit News Post /news/posts/1/edit
22
+ # Edit Blog Article
29
23
  def edit
30
24
  end
31
25
 
32
- # Create News Post /news/posts/new
26
+ # Create Blog Article
33
27
  def create
34
28
  @news_post = News::Post.new(news_post_params)
35
29
  @news_post.user_id = current_user
36
30
  if @news_post.save
37
- redirect_to news_posts_path, notice: 'News post was successfully created.'
31
+ redirect_to news_posts_path, notice: 'Blog Article was Successfully Created.'
38
32
  else
39
33
  render 'new'
40
34
  end
41
35
  end
42
36
 
43
- # PATCH/PUT
37
+ # Update Blog Article
44
38
  def update
45
39
  if @news_post.update(news_post_params)
46
- redirect_to news_posts_path, notice: 'News post was successfully updated.'
40
+ redirect_to news_posts_path, notice: 'Blog Article was Successfully Updated.'
47
41
  else
48
42
  render :edit
49
43
  end
50
44
  end
51
45
 
52
- # DELETE
46
+ # Delete Blog Article
53
47
  def destroy
54
48
  @news_post.destroy
55
- redirect_to news_posts_path, notice: 'News post was successfully destroyed.'
49
+ redirect_to news_posts_path, notice: 'Blog Article was Successfully Destroyed.'
56
50
  end
57
51
 
58
52
  private
@@ -62,9 +56,9 @@ module Phcpress
62
56
  @news_post = News::Post.find(params[:id])
63
57
  end
64
58
 
65
- # Whitelist on what can be posted
59
+ # Whitelist
66
60
  def news_post_params
67
- params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id)
61
+ params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
68
62
  end
69
63
 
70
64
  # Current User
data/app/controllers/phcpress/categories_controller.rb CHANGED
@@ -7,49 +7,49 @@ module Phcpress
7
7
  before_action :authenticate_user!
8
8
  before_action :set_category, only: [:edit, :update, :destroy]
9
9
 
10
- # GET /categories
10
+ # Categories Index
11
11
  def index
12
12
  @categories = Category.all
13
13
  end
14
14
 
15
- # GET /categories/new
15
+ # New News/Blog Category
16
16
  def new
17
17
  @category = Category.new
18
18
  end
19
19
 
20
- # GET /categories/1/edit
20
+ # Edit News/Blog Category
21
21
  def edit
22
22
  end
23
23
 
24
- # POST /categories
24
+ # Create News/Blog Category
25
25
  def create
26
26
  @category = Category.new(category_params)
27
27
 
28
28
  if @category.save
29
- redirect_to categories_path, notice: 'Category was successfully created.'
29
+ redirect_to categories_path, notice: 'Category was Successfully Created.'
30
30
  else
31
31
  render :new
32
32
  end
33
33
  end
34
34
 
35
- # PATCH/PUT
35
+ # Update News/Blog Category
36
36
  def update
37
37
  if @category.update(category_params)
38
- redirect_to categories_path, notice: 'Category was successfully updated.'
38
+ redirect_to categories_path, notice: 'Category was Successfully Updated.'
39
39
  else
40
40
  render :edit
41
41
  end
42
42
  end
43
43
 
44
- # DELETE
44
+ # Delete News/Blog Category
45
45
  def destroy
46
46
  @category.destroy
47
- redirect_to categories_path, notice: 'Category was successfully destroyed.'
47
+ redirect_to categories_path, notice: 'Category was Successfully Destroyed.'
48
48
  end
49
49
 
50
50
  private
51
51
 
52
- # Common callbacks
52
+ # Common Callbacks
53
53
  def set_category
54
54
  @category = Category.find(params[:id])
55
55
  end
data/app/controllers/phcpress/news/posts_controller.rb CHANGED
@@ -1,7 +1,5 @@
1
- # Load General Controller for Engine
2
1
  require_dependency "phcpress/application_controller"
3
2
 
4
- # Code for News Posting
5
3
  module Phcpress
6
4
  class News::PostsController < ApplicationController
7
5
 
@@ -11,27 +9,23 @@ module Phcpress
11
9
  before_action :current_user
12
10
  before_action :set_news_post, only: [:edit, :update, :destroy]
13
11
 
14
- # News Post Index (/news/posts)
12
+ # News Post Index
15
13
  def index
16
14
  @news_posts = News::Post.all
17
15
  end
18
16
 
19
- # Single News Post (/news/posts/1)
20
- #def show
21
- #end
22
-
23
- # Create a New News Post (/news/posts/new)
24
- def newW
17
+ # New News Article
18
+ def new
25
19
  @news_post = News::Post.new
26
20
  end
27
21
 
28
- # Edit News Post /news/posts/1/edit
22
+ # Edit News Article
29
23
  def edit
30
24
  end
31
25
 
32
- # Create News Post /news/posts/new
26
+ # Create News Article
33
27
  def create
34
- @news_post = News::Post.new(news_post_params)W
28
+ @news_post = News::Post.new(news_post_params)
35
29
  @news_post.user_id = current_user
36
30
  if @news_post.save
37
31
  redirect_to news_posts_path, notice: 'News Article was Successfully Created.'
@@ -40,7 +34,7 @@ module Phcpress
40
34
  end
41
35
  end
42
36
 
43
- # PATCH/PUT
37
+ # Update News Article
44
38
  def update
45
39
  if @news_post.update(news_post_params)
46
40
  redirect_to news_posts_path, notice: 'News Article was Successfully Updated.'
@@ -49,7 +43,7 @@ module Phcpress
49
43
  end
50
44
  end
51
45
 
52
- # DELETE
46
+ # Delete News Destroy
53
47
  def destroy
54
48
  @news_post.destroy
55
49
  redirect_to news_posts_path, notice: 'News Article was Successfully Destroyed.'
@@ -62,9 +56,9 @@ module Phcpress
62
56
  @news_post = News::Post.find(params[:id])
63
57
  end
64
58
 
65
- # Whitelist on what can be posted
59
+ # Whitelist
66
60
  def news_post_params
67
- params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id)
61
+ params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
68
62
  end
69
63
 
70
64
  # Current User
data/app/models/phcpress/blog/post.rb CHANGED
@@ -5,7 +5,7 @@ module Phcpress
5
5
  mount_uploader :pstimage, Phcpress::PstimageUploader
6
6
 
7
7
  # Associate Post Authour to User
8
- belongs_to :user, class_name: 'Phcengine::User'
8
+ belongs_to :user
9
9
 
10
10
  end
11
11
  end
data/app/models/phcpress/news/post.rb CHANGED
@@ -5,6 +5,7 @@ module Phcpress
5
5
  mount_uploader :pstimage, Phcpress::PstimageUploader
6
6
 
7
7
  # Associate Post Authour to User
8
- belongs_to :user, class_name: 'Phcengine::User'
8
+ belongs_to :user
9
+
9
10
  end
10
11
  end
data/app/views/phcpress/blog/posts/_form.html.erb CHANGED
@@ -11,8 +11,12 @@
11
11
  </div>
12
12
  <div class="panel-body">
13
13
  <div class="form-group">
14
- <label><%= f.label :pststatus, "Post Status" %></label>
15
- <%= f.select :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], class: "form-control" %>
14
+ <%= f.label :pststatus, "Post Status" %>
15
+ <%= f.select( :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], {class: "form-control form-control-sm"}) %>
16
+ </div>
17
+ <div class="form-group">
18
+ <%= f.label :pstcategory, "Post Category" %>
19
+ <%= collection_select(:pstcategory, :pstcategory_id, Phcpress::Blog::Post.order('blogpsttitle'), :id, :blogpsttitle, {}, {class: "form-control form-control-sm"}) %>
16
20
  </div>
17
21
  <div class="actions">
18
22
  <%= f.submit "Publish Blog Article", class: "btn btn-primary btn-sm" %>
data/app/views/phcpress/categories/edit.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="panel panel-primary">
3
3
 
4
4
  <div class="panel-heading">
5
- <i class="fa fa-pencil-square-o"></i> Edit Category
5
+ <i class="fa fa-list-ul"></i> Edit Category
6
6
  </div>
7
7
 
8
8
  <div class="panel-body">
data/app/views/phcpress/categories/index.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="panel panel-primary">
4
4
 
5
5
  <div class="panel-heading">
6
- <i class="fa fa-pencil-square-o"></i> Category List
6
+ <i class="fa fa-list-ul"></i> Category List
7
7
  </div>
8
8
 
9
9
  <div class="panel-body">
data/app/views/phcpress/categories/new.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="panel panel-primary">
3
3
 
4
4
  <div class="panel-heading">
5
- <i class="fa fa-pencil-square-o"></i> New Category
5
+ <i class="fa fa-list-ul"></i> New Category
6
6
  </div>
7
7
 
8
8
  <div class="panel-body">
data/app/views/phcpress/news/posts/_form.html.erb CHANGED
@@ -11,8 +11,12 @@
11
11
  </div>
12
12
  <div class="panel-body">
13
13
  <div class="form-group">
14
- <label><%= f.label :pststatus, "Post Status" %></label>
15
- <%= f.select :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], class: "form-control" %>
14
+ <%= f.label :pststatus, "Post Status" %>
15
+ <%= f.select( :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], {class: "form-control form-control-sm"}) %>
16
+ </div>
17
+ <div class="form-group">
18
+ <%= f.label :pstcategory, "Post Category" %>
19
+ <%= collection_select(:pstcategory, :pstcategory_id, Phcpress::News::Post.order('newspsttitle'), :id, :newspsttitle, {}, {class: "form-control form-control-sm"}) %>
16
20
  </div>
17
21
  <div class="actions">
18
22
  <%= f.submit "Publish News Article", class: "btn btn-primary btn-sm" %>
data/db/migrate/20160425194021_add_phcpress_category_to_phcpress_blog_posts.rb ADDED
@@ -0,0 +1,7 @@
1
+ class AddPhcpressCategoryToPhcpressBlogPosts < ActiveRecord::Migration
2
+
3
+ def change
4
+ add_column :pstcategory_id, :phcpress_blog_posts, :string
5
+ end
6
+
7
+ end
data/db/migrate/20160425194321_add_phcpress_category_to_phcpress_news_post.rb ADDED
@@ -0,0 +1,7 @@
1
+ class AddPhcpressCategoryToPhcpressNewsPost < ActiveRecord::Migration
2
+
3
+ def change
4
+ add_column :pstcategory_id, :phcpress_news_posts, :string
5
+ end
6
+
7
+ end
data/lib/phcpress/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phcpress
2
- VERSION = "3.7.0"
2
+ VERSION = "3.7.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcpress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.7.0
4
+ version: 3.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-25 00:00:00.000000000 Z
11
+ date: 2016-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -90,20 +90,20 @@ dependencies:
90
90
  requirements:
91
91
  - - "~>"
92
92
  - !ruby/object:Gem::Version
93
- version: '3.5'
93
+ version: '4.0'
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: 3.5.6
96
+ version: 4.0.1
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '3.5'
103
+ version: '4.0'
104
104
  - - ">="
105
105
  - !ruby/object:Gem::Version
106
- version: 3.5.6
106
+ version: 4.0.1
107
107
  - !ruby/object:Gem::Dependency
108
108
  name: carrierwave
109
109
  requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,20 @@ dependencies:
164
164
  requirements:
165
165
  - - "~>"
166
166
  - !ruby/object:Gem::Version
167
- version: '4.5'
167
+ version: '4.6'
168
168
  - - ">="
169
169
  - !ruby/object:Gem::Version
170
- version: 4.5.0.1
170
+ version: 4.6.1.0
171
171
  type: :runtime
172
172
  prerelease: false
173
173
  version_requirements: !ruby/object:Gem::Requirement
174
174
  requirements:
175
175
  - - "~>"
176
176
  - !ruby/object:Gem::Version
177
- version: '4.5'
177
+ version: '4.6'
178
178
  - - ">="
179
179
  - !ruby/object:Gem::Version
180
- version: 4.5.0.1
180
+ version: 4.6.1.0
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: sass-rails
183
183
  requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ dependencies:
227
227
  version: '1.5'
228
228
  - - ">="
229
229
  - !ruby/object:Gem::Version
230
- version: 1.5.1
230
+ version: 1.5.3
231
231
  type: :development
232
232
  prerelease: false
233
233
  version_requirements: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ dependencies:
237
237
  version: '1.5'
238
238
  - - ">="
239
239
  - !ruby/object:Gem::Version
240
- version: 1.5.1
240
+ version: 1.5.3
241
241
  - !ruby/object:Gem::Dependency
242
242
  name: factory_girl_rails
243
243
  requirement: !ruby/object:Gem::Requirement
@@ -403,6 +403,8 @@ files:
403
403
  - db/migrate/20160316131626_create_phcpress_news_posts.rb
404
404
  - db/migrate/20160316131650_create_phcpress_blog_posts.rb
405
405
  - db/migrate/20160424211134_create_phcpress_categories.rb
406
+ - db/migrate/20160425194021_add_phcpress_category_to_phcpress_blog_posts.rb
407
+ - db/migrate/20160425194321_add_phcpress_category_to_phcpress_news_post.rb
406
408
  - lib/phcpress.rb
407
409
  - lib/phcpress/engine.rb
408
410
  - lib/phcpress/version.rb