diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb index 317885a..ce72054 100755 --- a/app/controllers/beispiele_controller.rb +++ b/app/controllers/beispiele_controller.rb @@ -22,7 +22,7 @@ class BeispieleController < ApplicationController # @lva = params([:lva]) unless params([:lva]).nil? @beispiel = Beispiel.find(params[:id]) respond_to do |format| - format.html { redirect_to lva_path(@beispiel.lva )} + format.html { redirect_to lva_path(@beispiel.lva , show_comments: params[:show_comments])} format.js end end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb new file mode 100644 index 0000000..39e0490 --- /dev/null +++ b/app/controllers/comments_controller.rb @@ -0,0 +1,94 @@ +class CommentsController < ApplicationController + def index + @commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil? + @comments=@commentable.comments.order(:created_at).roots.page(params[:page]).per(2).reverse_order + respond_to do |format| + format.html # new.html.erb + format.json { render json: @comment } + format.js + end + + end + def hide + @commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil? + respond_to do |format| + format.js + end + + end + def show + @comment = Comment.find(params[:id]) + + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @comment } + end + end + def new + @comment = Comment.new + @comment.commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil? + respond_to do |format| + format.html # new.html.erb + format.json { render json: @comment } + format.js + end + end + + # GET /comments/1/edit + def edit + @comment = Comment.find(params[:id]) + end + + # POST /comments + # POST /comments.json + def create + params_new= params[:comment].select {|i| !["commentable_id", "commentable_type"].include?(i)} + + c = params[:comment][:commentable_type].constantize.find(params[:comment][:commentable_id]) unless params[:comment][:commentable_type].nil? or params[:comment][:commentable_id].nil? + + @comment = Comment.build_for(c, current_user,"", params_new) + respond_to do |format| + if @comment + format.html { redirect_to @comment.commentable, notice: 'Comment was successfully created.', show_comments: true } + format.json { render json: @comment, status: :created, location: @comment } + else + format.html { render action: "new" } + format.json { render json: @comment.errors, status: :unprocessable_entity } + end + end + end + + # PUT /comments/1 + # PUT /comments/1.json + def update + + params[:comment].select! {|i| !["commentable_id", "commentable_type"].include?(i)} + @comment = Comment.find(params[:id]) + @comment.commentable=params[:comment][:commentable_type].constantize.find(params[:comment][:commentable_id]) unless params[:comment][:commentable_type].nil? or params[:comment][:commentable_id].nil? + respond_to do |format| + + if @comment.update_attributes(params[:comment]) + format.html { redirect_to @comment.commentable, notice: 'Comment was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @comment.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /comments/1 + # DELETE /comments/1.json + def destroy + @comment = Comment.find(params[:id]) + @commentable=@comment.commentable + @comment.destroy + + respond_to do |format| + format.html { redirect_to @commentable, :action=>"show"} + format.json { head :no_content } + + end + end +end diff --git a/app/models/ability.rb b/app/models/ability.rb index 82c48f8..f0f992a 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -10,8 +10,8 @@ class Ability end end user ||= User.new # guest user (not logged in) - - + can :manage, Survey::Question + can :manage, Comment #----------------------------------------------------- # Rechteverwaltung fuer Studien Modul can [:show, :index], Studium, :visible=>true diff --git a/app/models/beispiel.rb b/app/models/beispiel.rb index 4725133..69f6660 100755 --- a/app/models/beispiel.rb +++ b/app/models/beispiel.rb @@ -17,6 +17,7 @@ class Beispiel < ActiveRecord::Base acts_as_votable acts_as_flagable belongs_to :lva + belongs_to :lecturer FLAG_ICONS = {"badquality"=>"fa fa-flag","goodquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} scope :not_flag_badquality, ->{where("flag_badquality IS NULL OR flag_badquality=?",false)} @@ -25,6 +26,9 @@ class Beispiel < ActiveRecord::Base scope :flag_delete, ->{where("flag_delete=?",true)} mount_uploader :beispieldatei, AttachmentUploader + + include IsCommentable + validates :beispieldatei, :presence => true validates :name, :presence => true validates :lva_id, :presence => true diff --git a/app/models/comment.rb b/app/models/comment.rb new file mode 100644 index 0000000..95c1630 --- /dev/null +++ b/app/models/comment.rb @@ -0,0 +1,51 @@ +class Comment < ActiveRecord::Base + attr_accessible :text,:anonym, :intern, :hidden + # commentable depth, official, intern, anonym + acts_as_votable + acts_as_nested_set :scope => [:commentable_id, :commentable_type] + belongs_to :commentable, :polymorphic=> true + belongs_to :user + validate :text, :presence=>true + validate :user, :presence=>true + validate :commentable, :presence=>true + include IsCommentable + + def self.build_for(set_commentable, user, text,attr={}) + c = new + raise "Tried to build comment for non commentable" unless set_commentable.try(:is_commentable?) + c.user=user + c.text=text + c.assign_attributes(attr) + + unless set_commentable.class.to_s == "Comment" + c.commentable=set_commentable + c.save + else + + c.commentable=set_commentable.commentable + c.save + c.move_to_child_of(set_commentable) + end + c + end + def thumb_url + t_url= user.fetprofile.picture.thumb.url unless user.nil? or user.fetprofile.nil? + t_url + end + def self.wrapid_for(c) + "comments_" + c.class.to_s.gsub(":","_") + "_" + c.id.to_s + end + + def self.switchshowid_for(c) + "show_comments_" + c.class.to_s.gsub(":","_") + "_" + c.id.to_s + end + def divid + "comment_" + id.to_s + end + def formid +"comment_form_" + commentable_type.gsub(":","_") + "_" + commentable_id.to_s + end + def self.formid_for(c) + "comment_form_" + c.class.to_s.gsub(":","_") + "_" + c.id.to_s + end +end diff --git a/app/models/survey/question.rb b/app/models/survey/question.rb index 6bba056..a6df7df 100644 --- a/app/models/survey/question.rb +++ b/app/models/survey/question.rb @@ -3,6 +3,8 @@ class Survey::Question < ActiveRecord::Base belongs_to :parent, polymorphic: true has_many :choices has_many :answers, through: :choices + include IsCommentable + def add_yesno_choices c=Survey::Choice.new(title: "Ja") c.save diff --git a/app/views/beispiele/_beispiel.html.erb b/app/views/beispiele/_beispiel.html.erb index 9e1aa4e..d5f0356 100644 --- a/app/views/beispiele/_beispiel.html.erb +++ b/app/views/beispiele/_beispiel.html.erb @@ -38,4 +38,20 @@ <% end %> + + <%= link_to "comment" , new_comment_path( commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true if can? :comment, beispiel %> + <%= link_to "comments:.."+beispiel.comments.count().to_s, comments_path(commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true, id: Comment.switchshowid_for(beispiel) %> +
+
+ <% unless beispiel.comments.roots.empty? %> +
+
+
+ <%= render partial:"comments/comments", object: beispiel.comments.order(:created_at).roots.reverse_order if params[:show_comments] %> +
+
+
+ <% end %> + + diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb new file mode 100644 index 0000000..2740c2f --- /dev/null +++ b/app/views/comments/_comment.html.erb @@ -0,0 +1,19 @@ +
+ <%= image_tag comment.thumb_url %> +
+ + <%= (!comment.anonym) ? comment.user.try(:email) : "Anonym" %> (<%= I18n.l(comment.created_at) %>) <%= link_to ffi1_icon("remove9"), comment, method: :delete, data: { confirm: 'Are you sure?' } %>: +

<%= comment.text %> +<% if can?(:comment, comment.commentable) %> +
<%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true %> +<% end %> +

+
+
+ + <%= render partial:"comments/comments", object: comment.children.order(:created_at).reverse_order if comment.children.size >0 %> + + +
+ +
diff --git a/app/views/comments/_comments.html.erb b/app/views/comments/_comments.html.erb new file mode 100644 index 0000000..4cda60e --- /dev/null +++ b/app/views/comments/_comments.html.erb @@ -0,0 +1,12 @@ +<% unless comments.empty? %> +
+ +
+<% if comments.first.root? %> +<%= paginate comments, :remote=>true , :theme=>'twitter-bootstrap'%> +<% end %> +<% end %> diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb new file mode 100644 index 0000000..0f9d2c8 --- /dev/null +++ b/app/views/comments/_form.html.erb @@ -0,0 +1,14 @@ +
+ <%= semantic_form_for form , remote:true, html: {class: "form-inline"} do |f| %> + <%= f.inputs do %> + <%= f.input :commentable_id, as: :hidden %> + <%= f.input :commentable_type, as: :hidden %> + <%= f.input :text, as: :string %> + <%= f.input :anonym %> + <% end %> + + <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> +<% end %> +
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb new file mode 100644 index 0000000..ba1980e --- /dev/null +++ b/app/views/comments/edit.html.erb @@ -0,0 +1,6 @@ +

Editing comment

+ +<%= render 'form', object: @comment %> + +<%= link_to 'Show', @comment %> | +<%= link_to 'Back', comments_path %> diff --git a/app/views/comments/hide.js.erb b/app/views/comments/hide.js.erb new file mode 100644 index 0000000..53ca8af --- /dev/null +++ b/app/views/comments/hide.js.erb @@ -0,0 +1,3 @@ +$("#<%= Comment.wrapid_for(@commentable) %>").html("<%= escape_javascript "" %>") + +$("#<%= Comment.switchshowid_for(@commentable) %>").attr("href","<%= escape_javascript comments_path(commentable_type: @commentable.class.to_s, commentable_id: @commentable.id) %>") diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb new file mode 100644 index 0000000..d97f147 --- /dev/null +++ b/app/views/comments/index.html.erb @@ -0,0 +1,22 @@ +

Listing comments

+<%= render partial:"comments/comments", object: @comments %> + + + + + + + + +<% @comments.each do |comment| %> + + + + + +<% end %> +
<%= link_to 'Show', comment %><%= link_to 'Edit', edit_comment_path(comment) %><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Comment', new_comment_path %> diff --git a/app/views/comments/index.js.erb b/app/views/comments/index.js.erb new file mode 100644 index 0000000..13d7356 --- /dev/null +++ b/app/views/comments/index.js.erb @@ -0,0 +1,2 @@ +$("#<%= Comment.wrapid_for(@commentable) %>").html("<%= escape_javascript render partial:"comments/comments", object: @comments %>") +$("#<%= Comment.switchshowid_for(@commentable) %>").attr("href","<%= escape_javascript hide_comments_path(commentable_type: @commentable.class.to_s, commentable_id: @commentable.id) %>") diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb new file mode 100644 index 0000000..4d10894 --- /dev/null +++ b/app/views/comments/new.html.erb @@ -0,0 +1,5 @@ +

New comment

+ +<%= render partial: 'form', object: @comment %> + +<%= link_to 'Back', comments_path %> diff --git a/app/views/comments/new.js.erb b/app/views/comments/new.js.erb new file mode 100644 index 0000000..814b5c9 --- /dev/null +++ b/app/views/comments/new.js.erb @@ -0,0 +1 @@ +$("#<%= @comment.formid %>").replaceWith("<%= escape_javascript render partial: "form", object: @comment %>") \ No newline at end of file diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb new file mode 100644 index 0000000..a0e0552 --- /dev/null +++ b/app/views/comments/show.html.erb @@ -0,0 +1,6 @@ +

<%= notice %>

+ +<%= render @comment %> + +<%= link_to 'Edit', edit_comment_path(@comment) %> | +<%= link_to 'Back', comments_path %> diff --git a/app/views/survey/choices/_choice.html.erb b/app/views/survey/choices/_choice.html.erb index 0954001..4b8ce9b 100644 --- a/app/views/survey/choices/_choice.html.erb +++ b/app/views/survey/choices/_choice.html.erb @@ -1,3 +1,4 @@ +
<%= link_to fa_icon("pencil"), edit_survey_choice_path(choice) , class: "btn btn-link navbar-btn" %> +
diff --git a/app/views/survey/choices/_choice_form.html.erb b/app/views/survey/choices/_choice_form.html.erb new file mode 100644 index 0000000..9a07420 --- /dev/null +++ b/app/views/survey/choices/_choice_form.html.erb @@ -0,0 +1 @@ +
<% end %> + + diff --git a/app/views/survey/questions/show.html.erb b/app/views/survey/questions/show.html.erb index 6189355..21d4d6a 100644 --- a/app/views/survey/questions/show.html.erb +++ b/app/views/survey/questions/show.html.erb @@ -6,6 +6,20 @@ <%= render @survey_question %> +<%= link_to "comment" , new_comment_path( commentable_type: "Survey::Question", commentable_id: @survey_question.id), remote:true if can? :comment, @survey_question %> +<%= link_to "comments:.."+ @survey_question.comments.count().to_s, comments_path(commentable_type: "Survey::Question", commentable_id: @survey_question.id), remote:true, id: Comment.switchshowid_for( @survey_question) %> +
+
+<% unless @survey_question.comments.roots.empty? %> +
+
+
+ <%= render partial:"comments/comments", object: @survey_question.comments.order(:created_at).roots.reverse_order if params[:show_comments] %> +
+
+
+<% end %> + <%= link_to 'Edit', edit_survey_question_path(@survey_question) %> | <%= link_to 'Back', survey_questions_path %> diff --git a/config/application.rb b/config/application.rb index 3de221a..401b965 100755 --- a/config/application.rb +++ b/config/application.rb @@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' require File.expand_path('lib/like_voteable.rb') - +require File.expand_path('lib/is_commentable.rb') if defined?(Bundler) # If you precompile assets before deploying to production, use this line diff --git a/config/routes.rb b/config/routes.rb index 59fdd01..ace8cc6 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,24 +1,17 @@ - Fetsite::Application.routes.draw do - namespace :survey do - resources :answers - end + resources :comments - - namespace :survey do - resources :choices - end - - - namespace :survey do - resources :questions do - member do - get :answer + namespace :survey do + resources :questions do + member do + get :answer put :answer - end - end - end - + end + end + resources :choices + resources :answers + end + themes_for_rails devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } resources :home, :only=>[:index] do @@ -168,7 +161,11 @@ end end end - + resources :comments do + collection do + get 'hide' + end + end resources :home, :only=>[:index] do get :search, :on => :collection collection do diff --git a/db/migrate/20140723172934_create_comments.rb b/db/migrate/20140723172934_create_comments.rb new file mode 100644 index 0000000..8b0ab02 --- /dev/null +++ b/db/migrate/20140723172934_create_comments.rb @@ -0,0 +1,19 @@ +class CreateComments < ActiveRecord::Migration + def change + create_table :comments do |t| + t.integer :user_id + t.integer :commentable_id + t.string :commentable_type + t.text :text + t.integer :parent_id + t.integer :lft + t.integer :rgt + t.integer :depth + t.boolean :hidden + t.boolean :official + t.boolean :intern + t.boolean :anonym + t.timestamps + end + end +end diff --git a/db/migrate/20150731183356_add_icon_to_choice.rb b/db/migrate/20150731183356_add_icon_to_choice.rb new file mode 100644 index 0000000..cbbe10c --- /dev/null +++ b/db/migrate/20150731183356_add_icon_to_choice.rb @@ -0,0 +1,5 @@ +class AddIconToChoice < ActiveRecord::Migration + def change + add_column :survey_choices, :icon, :string + end +end diff --git a/lib/is_commentable.rb b/lib/is_commentable.rb new file mode 100644 index 0000000..c5c1d56 --- /dev/null +++ b/lib/is_commentable.rb @@ -0,0 +1,20 @@ +module IsCommentable + def self.included(base) + base.class_eval do + include InstanceMethods + has_many :comments, as: :commentable, dependent: :destroy +# extend ClassMethods + + end + + end + module InstanceMethods + def is_commentable? + true + end + def comment(user, text, attr={}) + comments << Comment.build_for(self, user, text, attr) + end + end + +end