jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dfd

This commit is contained in:
wanglinchun 2014-06-06 21:40:58 +08:00
parent 391d4df3d1
commit 7f5fa8b9b8
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/contestnotifications_controller.rb
View File

@ -65,7 +65,8 @@ class ContestnotificationsController < ApplicationController
# GET /contestnotifications/1
# GET /contestnotifications/1.json
def show
# @contestnotification = Contestnotification.find(params[:id])
@contestnotification = Contestnotification.find(params[:id])
#
# respond_to do |format|
# format.html # show.html.erb

1
app/models/contestnotification.rb
View File

@ -2,6 +2,7 @@ class Contestnotification < ActiveRecord::Base
#attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
include Redmine::SafeAttributes
#Contestnotification::Notificationcomment
belongs_to :contest
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
has_many :notificationcomments, :as => :notificationcommented, :dependent => :delete_all, :order => "created_at"

2
app/models/notificationcomments.rb → app/models/notificationcomment.rb
View File

@ -1,4 +1,4 @@
class Notificationcomments < ActiveRecord::Base
class Notificationcomment < ActiveRecord::Base
attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
include Redmine::SafeAttributes

24
app/views/contestnotifications/show.html.erb
View File

@ -1,23 +1,23 @@
<div class="contextual">
<%= watcher_link(@contestnotifications, User.current) %>
<%= watcher_link(@contestnotification, User.current) %>
<%= link_to(l(:button_edit),
edit_contest_contestnotification_path(@contestnotifications),
edit_contest_contestnotification_path(@contestnotification),
:class => 'icon icon-edit',
:accesskey => accesskey(:edit),
:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
<%= delete_link contest_contestnotification_path(@contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
</div>
<h3><strong><%=h @contestnotifications.title %></strong></h3>
<h3><strong><%=h @contestnotification.title %></strong></h3>
<% if authorize_for_contest('contestnotifications', 'edit') %>
<div id="edit-contestnotifications" style="display:none;">
<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contest_contestnotification_path(@contestnotifications),
<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'contestnotifications-form',target='preview',{:class => ''} %> |
<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
<% end %>
<div id="preview" class="wiki"></div>
@ -27,16 +27,16 @@
<div id="notificationcomments" style="margin-bottom:16px;">
<div style="margin:15px">
<span class="font_description"> <%= textilizable(@contestnotifications, :description) %> </span>
<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
<br/>
<%= link_to_attachments @contestnotifications %>
<br/>
<!--add comment-->
<% if @contestnotifications.notificationcommentable? %>
<% if @contestnotification.notificationcommentable? %>
<p>
<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
</p>
<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotifications}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotification}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
<div class="box">
<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
@ -47,7 +47,7 @@
<% end %>
<% end %>
<% html_title @contestnotifications.title -%>
<% html_title @contestnotification.title -%>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
@ -57,7 +57,7 @@
<div class="line_heng"></div>
</div>
<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
<% notificationcomments = @notificationcomments.reverse %>
<% notificationcomments = @contestnotification.notificationcomments.reverse %>
<% notificationcomments.each do |notificationcomment| %>
<% next if notificationcomment.new_record? %>
<table width="660px" border="0" align="center">