From 19b04a49d01af1917385c166501ef086eddae437 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Wed, 23 Apr 2014 22:50:29 -0400 Subject: The users with permissions to send alerts can now create new alerts. --- app/controllers/alerts_controller.rb | 2 +- app/views/alerts/index.html.erb | 20 ++++++++++++-------- app/views/layouts/application.html.erb | 5 ++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb index 333022a..6ab3663 100644 --- a/app/controllers/alerts_controller.rb +++ b/app/controllers/alerts_controller.rb @@ -23,7 +23,7 @@ class AlertsController < ApplicationController # POST /alerts.json def create @alert = Alert.new(alert_params) - + @alert.author = current_user respond_to do |format| if @alert.save format.html { redirect_to @alert, notice: 'Alert was successfully created.' } diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb index 458b951..1d441a2 100644 --- a/app/views/alerts/index.html.erb +++ b/app/views/alerts/index.html.erb @@ -12,14 +12,18 @@ - <% @alerts.each do |alert| %> - - <%= alert.author %> - <%= alert.message %> - <%= link_to 'Show', alert %> - <%= link_to 'Edit', edit_alert_path(alert) %> - <%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %> - + <% if !@alerts.nil? %> + <% @alerts.each do |alert| %> + + <%= alert.author %> + <%= alert.message %> + <%= link_to 'Show', alert %> + <%= link_to 'Edit', edit_alert_path(alert) %> + <%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %> + + <% end %> + <% else %> +

There are no alerts!

<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d318129..15eba29 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,11 +27,14 @@
<% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> - <%= link_to "Messages", pms_path %> + <%= link_to "Messages", pms_path, :class => "signup" %> <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> <% if current_user.can? :edit_server %> <%= link_to "Server settings", edit_server_path, :class => "server" %> <% end %> + <% if current_user.can? :create_alert %> + <%= link_to "Create Alert", new_alert_path, :class => "signin" %> + <% end %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> -- cgit v1.1-4-g5e80 From 107f1f65c93cbe118a69e76514327c4862c7d51d Mon Sep 17 00:00:00 2001 From: nfoy Date: Wed, 23 Apr 2014 22:52:58 -0400 Subject: More mailboxer progress --- app/controllers/pms_controller.rb | 4 +-- app/views/pms/index.html.erb | 53 ++++++++++++++++++++++++++------------- app/views/pms/show.html.erb | 8 +++--- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb index 2cb55f8..1d6540d 100644 --- a/app/controllers/pms_controller.rb +++ b/app/controllers/pms_controller.rb @@ -24,8 +24,8 @@ class PmsController < ApplicationController def create @pm = Pm.new(pm_params) @pm.author = current_user - #require 'pp' - #pp pm_params['recipient_id'] + require 'pp' + pp @pm.message @pm.recipient = User.find_by_user_name(pm_params['recipient_id']) @pm.author.send_message(@pm.recipient, @pm.message, 'Default') diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb index 73c7a87..1175cb2 100644 --- a/app/views/pms/index.html.erb +++ b/app/views/pms/index.html.erb @@ -59,14 +59,26 @@

Inbox

- <% conversation1 = current_user.mailbox.inbox.first %> - <% if !conversation1.nil? %> - <% receipts1 = conversation1.receipts_for current_user %> - <% receipts1.each do |receipt1| %> - <% message1 = receipt1.message %> - <%= message1.subject %> - <%= message1.body %> - <% end %> + <% conversations = current_user.mailbox.inbox %> + <% if !conversations.nil? %> + + From + Subject + Body + + <% conversations.each do |conversation| %> + <% receipts = conversation.receipts_for current_user %> + <% receipts.each do |receipt| %> + <% message = receipt.message %> + + <%= conversation.last_sender.user_name %> + <%= message.subject %> + <%= message.body %> + <%# link_to 'Show', pm %> + + <% end %> + <% end %> + <% else %>

No Messages

<% end %> @@ -76,19 +88,26 @@

Outbox

- <% conversation1 = current_user.mailbox.sentbox.first %> - <% if !conversation1.nil? %> + <% conversations = current_user.mailbox.sentbox %> + <% if !conversations.nil? %> - From + To Subject Body - <% receipts1 = conversation1.receipts_for current_user %> - <% receipts1.each do |receipt1| %> - <% message1 = receipt1.message %> - <%= message1.subject %> - <%= message1.body %> - <% end %> + <% conversations.each do |conversation| %> + <% receipts = conversation.receipts_for current_user %> + <% receipts.each do |receipt| %> + <% message = receipt.message %> + + Doesn't work + <%= message.subject %> + <%= message.body %> + <%# link_to 'Show', conversation %> + + <% end %> + <% end %> + <% else %>

No Messages

<% end %> diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb index 595afce..cfaf00d 100644 --- a/app/views/pms/show.html.erb +++ b/app/views/pms/show.html.erb @@ -1,17 +1,17 @@

Author: - <%= @pm.author.user_name %> + <%= @conversation.last_sender.user_name %>

Recipient: - <%= @pm.recipient.user_name %> + <%#@pm.recipient.user_name %>

Message: - <%= @pm.message %> + <%# @pm.message %>

-<%= link_to 'Edit', edit_pm_path(@pm) %> | +<%# link_to 'Edit', edit_pm_path(@pm) %> | <%= link_to 'Back', pms_path %> -- cgit v1.1-4-g5e80