cafe-grader-web Commit - r766:4b83dfaa53e2

cafe-grader-web

Commit `r766:4b83dfaa53e2` public

parent | child

Description:

update message console

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 54 inserted, 50 deleted

app/views/messages/index.html.haml created 644 ¶ +24

@@ -0,0 +1,24
	1	+ .announcementbox
	2	+ %span{:class => 'title'}
	3	+ How to submit clarification requests
	4	+ .announcement
	5	+ %p
	6	+ :markdown
	7	+ The clarification requests should be phrased as yes/no questions.
	8	+ The answers will be one of the following:
	9	+ (1) YES,
	10	+ (2) <b>NO</b>,
	11	+ (3) ANSWERED IN TASK DESCRIPTION (EXPLICITLY OR IMPLICITLY),
	12	+ (4) INVALID QUESTION, and
	13	+ (5) NO COMMENT.
	14	+
	15	+ = form_for 'message', :url => { :action => 'create'} do \|f\|
	16	+ %p
	17	+ %b New clarification request
	18	+ = submit_tag "Post"
	19	+ %br/
	20	+ = f.text_area :body, :rows => 5, :cols => 100
	21	+
	22	+ %hr/
	23	+
	24	+ = render :partial => 'message', :collection => @messages, :locals => {:reply => false}

app/controllers/messages_controller.rb ¶ +22 -18

               class MessagesController < ApplicationController
-            -   before_action :authenticate
+            +   before_action :check_valid_login
+            +   before_action :set_message, only: ['show', 'reply']
-            -   before_filter :admin_authorization, :only => ['console','show',
+            +   before_action :admin_authorization, :only => ['console','show',
                                                               'reply','hide','list_all']
-            -   def list
+            +   def index
-            -     @user = User.find(session[:user_id])
+            +     @messages = Message.find_all_sent_by_user(@current_user)
-            -     @messages = Message.find_all_sent_by_user(@user)
                 end
                 def console
-            -     @user = User.find(session[:user_id])
                   @messages = Message.find_all_system_unreplied_messages
                 end
                 def show
-            -     @message = Message.find(params[:id])
                 end
                 def list_all
-            -     @user = User.find(session[:user_id])
                   @messages = Message.where(receiver_id: nil).order(:created_at)
                 end
                 def create
-            -     user = User.find(session[:user_id])
+            +     @message = Message.new(message_params)
-            -     @message = Message.new(params[:message])
+            +     @message.sender = @current_user
-            -     @message.sender = user
                   if @message.body == '' or !@message.save
                     flash[:notice] = 'An error occurred'
                   else
                     flash[:notice] = 'New message posted'
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to action: 'index'
                 end
                 def reply
-            -     user = User.find(session[:user_id])
+            +     @r_message = Message.new(message_params)
-            -     @message = Message.new(params[:r_message])
+            +     @r_message.receiver = @message.sender
-            -     @message.sender = user
+            +     @r_message.sender = @current_user
                   if @message.body == '' or !@message.save
                     flash[:notice] = 'An error occurred'
                     redirect_to :action => 'show', :id => @message.replying_message_id
                   else
                     flash[:notice] = 'Message replied'
-            -       rep_msg = @message.replying_message
+            +       @message.replied = true
-            -       rep_msg.replied = true
+            +       @message.replying_message = @r_message
-            -       rep_msg.save
+            +       @message.save
                     redirect_to :action => 'console'
                   end
                 end
                     end
                   end
+            +     def set_message
+            +       @message = Message.find(params[:id])
                   end
+            +
+            +     def message_params
+            +       params.require(:message).permit(:body)
+            +     end
+            +
+            + end

app/views/messages/console.html.haml ¶ -1

@@ -1,4 +1,3
1	- = user_title_bar(@user)
2		1
3	%h1 Console: active messages	2	%h1 Console: active messages
4		3

app/views/messages/list_all.html.haml ¶ -2

-            - = user_title_bar(@user)
               %h1 Console: all messages
               = link_to '[active messages]', :action => 'list_all'

app/views/messages/show.html.haml ¶ +3 -3

                 .body= simple_format(@message.body)
               %h3 Your reply:
-            - = form_for 'r_message', :url => { :action => 'reply'} do |f|
+            + = form_for 'message', url: reply_message_path(@message) do |f|
                 = f.text_area :body, :rows => 5, :cols => 100
-            -   = f.hidden_field :receiver_id, {:value => @message.sender_id }
+            +   -#= f.hidden_field :receiver_id, {:value => @message.sender_id }
-            -   = f.hidden_field :replying_message_id, {:value => @message.id }
+            +   -#= f.hidden_field :replying_message_id, {:value => @message.id }
                 = submit_tag "Post"
               %p

config/routes.rb ¶ +5

                 resources :test
                 resources :messages do
+            +     member do
+            +       get 'hide'
+            +       post 'reply'
+            +     end
                   collection do
                     get 'console'
+            +       get 'list_all'
                   end
                 end

app/views/messages/list.html.haml removed ¶ -26

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 54 inserted, 50 deleted

Sign in to your account

Commit r766:4b83dfaa53e2 public

Author

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 54 inserted, 50 deleted

Commit `r766:4b83dfaa53e2` public