mix-rails-message-board 0.22.0 → 0.23.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/admix/board_messages_controller.rb +2 -2
- data/app/controllers/board_messages_controller.rb +1 -1
- data/app/models/admix/board_messages_datagrid.rb +3 -3
- data/app/models/admix/board_replies_datagrid.rb +3 -3
- data/app/models/board_message.rb +12 -21
- data/app/models/board_reply.rb +19 -20
- data/app/views/admix/board_messages/_form_fields.html.haml +1 -1
- data/app/views/admix/board_messages/_show.html.haml +4 -4
- data/app/views/admix/board_messages/_table_actions.html.haml +2 -2
- data/app/views/admix/board_replies/_form_fields.html.haml +1 -1
- data/app/views/admix/board_replies/_show.html.haml +2 -2
- data/app/views/admix/board_replies/_table_actions.html.haml +2 -2
- data/app/views/board_messages/_board_message.html.haml +1 -1
- data/config/locales/message-board.pt-BR.yml +6 -1
- data/db/migrate/20130208130406_create_board_messages.rb +13 -0
- data/db/migrate/20130208130716_create_board_replies.rb +14 -0
- data/lib/mix-rails-message-board/version.rb +1 -1
- metadata +6 -4
@@ -1,14 +1,14 @@
|
|
1
1
|
class Admix::BoardMessagesController < Admix::InheritedController
|
2
2
|
|
3
3
|
def approve
|
4
|
-
resource.
|
4
|
+
resource.status = :approved
|
5
5
|
resource.save!
|
6
6
|
flash[:notice] = t('boardmessages.flashes.approved')
|
7
7
|
redirect_to collection_url
|
8
8
|
end
|
9
9
|
|
10
10
|
def disapprove
|
11
|
-
resource.
|
11
|
+
resource.status = :disapproved
|
12
12
|
resource.save!
|
13
13
|
flash[:notice] = t('boardmessages.flashes.disapproved')
|
14
14
|
redirect_to collection_url
|
@@ -4,7 +4,7 @@ class Admix::BoardMessagesDatagrid
|
|
4
4
|
extend AdmixHelper
|
5
5
|
|
6
6
|
scope do
|
7
|
-
BoardMessage.
|
7
|
+
BoardMessage.order('date DESC')
|
8
8
|
end
|
9
9
|
|
10
10
|
filter :date do |value|
|
@@ -22,8 +22,8 @@ class Admix::BoardMessagesDatagrid
|
|
22
22
|
board_message.board_replies.count
|
23
23
|
end
|
24
24
|
|
25
|
-
column :
|
26
|
-
board_message.
|
25
|
+
column :status, header: input_label(:board_message, :status) do |board_message|
|
26
|
+
board_message.status.text
|
27
27
|
end
|
28
28
|
|
29
29
|
include Admix::TableActions
|
@@ -6,7 +6,7 @@ class Admix::BoardRepliesDatagrid
|
|
6
6
|
|
7
7
|
|
8
8
|
scope do
|
9
|
-
BoardReply
|
9
|
+
BoardReply.order('date DESC')
|
10
10
|
end
|
11
11
|
|
12
12
|
filter :date do |value|
|
@@ -20,8 +20,8 @@ class Admix::BoardRepliesDatagrid
|
|
20
20
|
board_reply.date.strftime("%d/%m/%Y")
|
21
21
|
end
|
22
22
|
|
23
|
-
column :
|
24
|
-
board_reply.
|
23
|
+
column :status, header: input_label(:board_reply, :status) do |board_reply|
|
24
|
+
board_reply.status.text
|
25
25
|
end
|
26
26
|
|
27
27
|
include Admix::TableActions
|
data/app/models/board_message.rb
CHANGED
@@ -1,29 +1,20 @@
|
|
1
|
-
class BoardMessage
|
2
|
-
|
3
|
-
include Mongoid::Document
|
4
|
-
include Mongoid::Timestamps
|
5
|
-
include Mongoid::Paranoia
|
6
|
-
|
1
|
+
class BoardMessage < ActiveRecord::Base
|
7
2
|
extend Enumerize
|
8
3
|
|
9
|
-
|
10
|
-
|
11
|
-
field :message, type: String
|
12
|
-
field :date, type: DateTime, default: -> { Time.now }
|
13
|
-
field :approved, type: String
|
14
|
-
enumerize :approved, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
|
15
|
-
|
16
|
-
|
17
|
-
validates_presence_of :name
|
18
|
-
validates_presence_of :email
|
19
|
-
validates_presence_of :message
|
20
|
-
validates_presence_of :date
|
4
|
+
attr_accessible :date, :email, :message, :name, :status
|
5
|
+
enumerize :status, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
|
21
6
|
|
7
|
+
validates_presence_of :name, :email, :message, :date
|
22
8
|
validates :email, email: true
|
23
9
|
|
24
|
-
scope :approved, where(
|
25
|
-
scope :pending, where(
|
10
|
+
scope :approved, where(status: :approved)
|
11
|
+
scope :pending, where(status: :pending)
|
12
|
+
|
13
|
+
has_many :board_replies
|
26
14
|
|
27
|
-
embeds_many :board_replies, cascade_callbacks: true
|
28
15
|
|
16
|
+
default_value_for :date do
|
17
|
+
Time.now
|
18
|
+
end
|
19
|
+
|
29
20
|
end
|
data/app/models/board_reply.rb
CHANGED
@@ -1,28 +1,27 @@
|
|
1
|
-
class BoardReply
|
1
|
+
class BoardReply < ActiveRecord::Base
|
2
|
+
extend Enumerize
|
2
3
|
|
3
|
-
|
4
|
-
|
5
|
-
include Mongoid::Paranoia
|
4
|
+
attr_accessible :date, :email, :message, :name, :status
|
5
|
+
enumerize :status, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
|
6
6
|
|
7
|
-
|
7
|
+
validates_presence_of :name, :email, :message, :date
|
8
|
+
validates :email, email: true
|
8
9
|
|
9
|
-
|
10
|
-
|
11
|
-
field :message, type: String
|
12
|
-
field :date, type: DateTime, default: -> { Time.now }
|
13
|
-
field :approved, type: String
|
14
|
-
enumerize :approved, in: [:pending, :approved, :disapproved], default: :approved, predicates: true
|
15
|
-
|
10
|
+
scope :approved, where(status: :approved)
|
11
|
+
scope :pending, where(status: :pending)
|
16
12
|
|
17
|
-
|
18
|
-
validates_presence_of :email
|
19
|
-
validates_presence_of :date
|
13
|
+
belongs_to :board_message
|
20
14
|
|
21
|
-
|
15
|
+
default_value_for :name do
|
16
|
+
Setting.app_title
|
17
|
+
end
|
22
18
|
|
23
|
-
|
24
|
-
|
19
|
+
default_value_for :email do
|
20
|
+
Setting.app_email
|
21
|
+
end
|
25
22
|
|
26
|
-
|
23
|
+
default_value_for :date do
|
24
|
+
Time.now
|
25
|
+
end
|
27
26
|
|
28
|
-
end
|
27
|
+
end
|
@@ -7,10 +7,10 @@
|
|
7
7
|
%dd= resource.message
|
8
8
|
%dt= input_label(:board_message, :date)
|
9
9
|
%dd= localize(resource.date)
|
10
|
-
%dt= input_label(:board_message, :
|
10
|
+
%dt= input_label(:board_message, :status)
|
11
11
|
%dd
|
12
|
-
= resource.
|
13
|
-
- if resource.disapproved? or resource.
|
12
|
+
= resource.status.text
|
13
|
+
- if resource.disapproved? or resource.status.pending?
|
14
14
|
= link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
|
15
|
-
- if resource.
|
15
|
+
- if resource.status.approved? or resource.status.pending?
|
16
16
|
= link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
|
@@ -1,6 +1,6 @@
|
|
1
|
-
- if resource.disapproved? or resource.
|
1
|
+
- if resource.disapproved? or resource.status.pending?
|
2
2
|
= link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
|
3
|
-
- if resource.
|
3
|
+
- if resource.status.approved? or resource.status.pending?
|
4
4
|
= link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
|
5
5
|
|
6
6
|
= link_to image_tag('admix/icons/comment_add.png'), new_admix_board_message_board_reply_path(resource), class: 'btn', title:'Adicionar comentário'
|
@@ -1,6 +1,6 @@
|
|
1
|
-
- if resource.disapproved? or resource.
|
1
|
+
- if resource.disapproved? or resource.status.pending?
|
2
2
|
= link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
|
3
|
-
- if resource.
|
3
|
+
- if resource.status.approved? or resource.status.pending?
|
4
4
|
= link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
|
5
5
|
|
6
6
|
= link_to image_tag('admix/zoom.png'), resource_url(resource), class: 'btn', title:'Visualizar registro'
|
@@ -11,7 +11,12 @@ pt-BR:
|
|
11
11
|
models:
|
12
12
|
board_message: 'Mensagem'
|
13
13
|
board_reply: 'Resposta'
|
14
|
-
|
14
|
+
board_messages:
|
15
|
+
board_messages: 'Mural de recados'
|
16
|
+
board_message: 'Recado'
|
17
|
+
board_replies:
|
18
|
+
board_replies: 'Respostas do mural'
|
19
|
+
board_message: 'Resposta'
|
15
20
|
simple_form:
|
16
21
|
labels:
|
17
22
|
board_message:
|
@@ -0,0 +1,14 @@
|
|
1
|
+
class CreateBoardReplies < ActiveRecord::Migration
|
2
|
+
def change
|
3
|
+
create_table :board_replies do |t|
|
4
|
+
t.string :name
|
5
|
+
t.string :email
|
6
|
+
t.text :message
|
7
|
+
t.datetime :date
|
8
|
+
t.string :status
|
9
|
+
|
10
|
+
t.references :board_message
|
11
|
+
t.timestamps
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mix-rails-message-board
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.23.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-02-
|
12
|
+
date: 2013-02-08 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -56,6 +56,8 @@ files:
|
|
56
56
|
- app/views/message_board_mailer/message_replied.text.erb
|
57
57
|
- config/locales/message-board.pt-BR.yml
|
58
58
|
- config/routes.rb
|
59
|
+
- db/migrate/20130208130406_create_board_messages.rb
|
60
|
+
- db/migrate/20130208130716_create_board_replies.rb
|
59
61
|
- lib/tasks/message-board_tasks.rake
|
60
62
|
- lib/mix-rails-message-board/version.rb
|
61
63
|
- lib/mix-rails-message-board/engine.rb
|
@@ -77,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
77
79
|
version: '0'
|
78
80
|
segments:
|
79
81
|
- 0
|
80
|
-
hash: -
|
82
|
+
hash: -1981333585521857004
|
81
83
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
82
84
|
none: false
|
83
85
|
requirements:
|
@@ -86,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
86
88
|
version: '0'
|
87
89
|
segments:
|
88
90
|
- 0
|
89
|
-
hash: -
|
91
|
+
hash: -1981333585521857004
|
90
92
|
requirements: []
|
91
93
|
rubyforge_project:
|
92
94
|
rubygems_version: 1.8.24
|