diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-23 22:50:29 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-23 22:50:29 -0400 |
| commit | 19b04a49d01af1917385c166501ef086eddae437 (patch) | |
| tree | 9d557f3331b9070296d4de704a13b695677474ff | |
| parent | 9afd5a4f7a86eeaab3fa8a0c25609ac7977e0489 (diff) | |
The users with permissions to send alerts can now create new alerts.
| -rw-r--r-- | app/controllers/alerts_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/alerts/index.html.erb | 20 | ||||
| -rw-r--r-- | 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 @@ </thead> <tbody> - <% @alerts.each do |alert| %> - <tr> - <td><%= alert.author %></td> - <td><%= alert.message %></td> - <td><%= link_to 'Show', alert %></td> - <td><%= link_to 'Edit', edit_alert_path(alert) %></td> - <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td> - </tr> + <% if !@alerts.nil? %> + <% @alerts.each do |alert| %> + <tr> + <td><%= alert.author %></td> + <td><%= alert.message %></td> + <td><%= link_to 'Show', alert %></td> + <td><%= link_to 'Edit', edit_alert_path(alert) %></td> + <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td> + </tr> + <% end %> + <% else %> + <td><p>There are no alerts!</p></td> <% end %> </tbody> </table> 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 @@ <div id="log-buttons"> <% 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" %> |