From 9fc0efd467e8e6aa0be15df7ebd7e9228dccebe4 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 12:03:01 +0200 Subject: [PATCH 1/5] AutoCommit Fre Jun 26 12:03:01 CEST 2015 --- app/helpers/application_helper.rb | 15 +++++++++++ app/views/beispiele/_beispiel.html.erb | 1 + .../themes/blue2/beispiele/_beispiel.html.erb | 26 +++---------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d59d2f9..9bcb565 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -126,5 +126,20 @@ m.save "blue1" end end + def like_dislike_for(obj) + out="" + if can?(:like, obj) + out += link_to ffi1_icon("like3")+" like" + "("+obj.get_likes.size.to_s+")", url_for([:like, obj]),title: "liked by " + ((current_user.liked?(obj)) ? ("you and " + ((obj.get_likes.size - 1).to_s + " others")) : obj.get_likes.size.to_s), remote: true + else + out += "liked by " + obj.get_likes.size.to_s + end + + if can?(:dislike, obj) + out += link_to ffi1_icon("dislike")+" dislike" + "("+obj.get_dislikes.size.to_s+")", url_for([:dislike, obj]),title:"disliked by " + ((current_user.disliked?(obj)) ? ("you and " + ((obj.get_dislikes.size - 1).to_s + " others")) : obj.get_dislikes.size.to_s) , remote: true + else + out += "disliked by " + obj.get_dislikes.size.to_s + end + raw(out) + end end diff --git a/app/views/beispiele/_beispiel.html.erb b/app/views/beispiele/_beispiel.html.erb index 8f9f51e..9e1aa4e 100644 --- a/app/views/beispiele/_beispiel.html.erb +++ b/app/views/beispiele/_beispiel.html.erb @@ -7,6 +7,7 @@ <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB
+ <%= if can?(:like, beispiel) link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s), remote: true diff --git a/app/views/themes/blue2/beispiele/_beispiel.html.erb b/app/views/themes/blue2/beispiele/_beispiel.html.erb index 5f8ca83..d180973 100644 --- a/app/views/themes/blue2/beispiele/_beispiel.html.erb +++ b/app/views/themes/blue2/beispiele/_beispiel.html.erb @@ -8,30 +8,12 @@
<%= flag_link(beispiel, "goodquality")%> - <%= flag_link(beispiel, "badquality")%> <%= flag_link(beispiel, "delete")%> - - <%= - if can?(:like, beispiel) - link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s), remote: true - else - "liked by " + beispiel.get_likes.size.to_s - end - %> - - <%= - if can?(:dislike, beispiel) - link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) : beispiel.get_dislikes.size.to_s) , remote: true - else - "disliked by " + beispiel.get_dislikes.size.to_s - end - - %> - - <%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%> - <%= link_to fa_icon("trash")+"delete", beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %> - <% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %>
+ <%= like_dislike_for(beispiel) %> + <%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%> + <%= link_to fa_icon("trash")+"delete", beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %> + <% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %>
<% unless beispiel.desc.nil? || beispiel.desc.empty? %> From 9c073a91c38026f880acabca972f0b6fd6cda347 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 13:03:01 +0200 Subject: [PATCH 2/5] AutoCommit Fre Jun 26 13:03:01 CEST 2015 --- lib/flagable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/flagable.rb b/lib/flagable.rb index 01aabff..e24b1e7 100644 --- a/lib/flagable.rb +++ b/lib/flagable.rb @@ -63,7 +63,7 @@ module Flagable fi = obj.class::FLAG_ICONS value=obj.send("flag_"+flag) cstyle=(value) ? "true" :"false" - link_to ff_icon(fi[flag]), flag_beispiel_path(obj,{flag: flag, value: !value, theme: nil, locale: nil}), remote: true, class:("flag-"+cstyle +" flag-"+flag + "-"+cstyle ), id: obj.flaglinkid(flag) + link_to ff_icon(fi[flag]), url_for(obj,action: :flag, flag: flag, value: !value, theme: nil, locale: nil), remote: true, class:("flag-"+cstyle +" flag-"+flag + "-"+cstyle ), id: obj.flaglinkid(flag) end end end From 6aeccfb1d6c5622050ffb00a169a0421b3b8e8ba Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 14:03:06 +0200 Subject: [PATCH 3/5] AutoCommit Fre Jun 26 14:03:06 CEST 2015 --- app/views/beispiele/edit.html.erb | 1 + app/views/themes/blue2/beispiele/_beispiel.html.erb | 7 +++++-- lib/flagable.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/beispiele/edit.html.erb b/app/views/beispiele/edit.html.erb index e5eac4c..9151086 100755 --- a/app/views/beispiele/edit.html.erb +++ b/app/views/beispiele/edit.html.erb @@ -1,4 +1,5 @@

Editing beispiel

+

<%= notice %>

<%= render 'form' %> diff --git a/app/views/themes/blue2/beispiele/_beispiel.html.erb b/app/views/themes/blue2/beispiele/_beispiel.html.erb index d180973..5a7e1b7 100644 --- a/app/views/themes/blue2/beispiele/_beispiel.html.erb +++ b/app/views/themes/blue2/beispiele/_beispiel.html.erb @@ -1,12 +1,15 @@
-
+
<%=link_to ffi1_icon("note20")+" " + beispiel.name + " " + I18n.l(beispiel.datum), beispiel.beispieldatei.url, title: beispiel.desc %>
<%= (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB
-
+
+ <%= beispiel.lecturer.try(:name).to_s %> +
+
<%= flag_link(beispiel, "goodquality")%> <%= flag_link(beispiel, "badquality")%> <%= flag_link(beispiel, "delete")%> diff --git a/lib/flagable.rb b/lib/flagable.rb index e24b1e7..d6f8dc7 100644 --- a/lib/flagable.rb +++ b/lib/flagable.rb @@ -63,7 +63,7 @@ module Flagable fi = obj.class::FLAG_ICONS value=obj.send("flag_"+flag) cstyle=(value) ? "true" :"false" - link_to ff_icon(fi[flag]), url_for(obj,action: :flag, flag: flag, value: !value, theme: nil, locale: nil), remote: true, class:("flag-"+cstyle +" flag-"+flag + "-"+cstyle ), id: obj.flaglinkid(flag) + link_to ff_icon(fi[flag]), url_for({controller: obj.class.name.tableize,action: :flag, flag: flag, value: !value, theme: nil, locale: nil, id: obj.id}), remote: true, class:("flag-"+cstyle +" flag-"+flag + "-"+cstyle ), id: obj.flaglinkid(flag) end end end From 2ca5f4943652e121bd9caf86a80318b23e9505f3 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 15:03:04 +0200 Subject: [PATCH 4/5] AutoCommit Fre Jun 26 15:03:04 CEST 2015 --- app/controllers/lvas_controller.rb | 2 +- app/views/beispiele/edit.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index 760d3e4..a5d0360 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -48,7 +48,7 @@ class LvasController < ApplicationController @lva = Lva.find_by_id(params[:id]) @beispiel=Beispiel.new @beispiele_all=@lva.beispiele.order(:datum).accessible_by(current_ability, :show) - @beispiele = @lva.beispiele.not_flag_badquality.not_flag_delete.order(:datum).accessible_by(current_ability, :show) + @beispiele = @lva.beispiele.not_flag_badquality.not_flag_delete.order(:lecturer_id,:datum).accessible_by(current_ability, :show) @beispiele_badQ = @lva.beispiele.flag_badquality.not_flag_delete.order(:datum).accessible_by(current_ability, :show) @beispiele_deleted = @lva.beispiele.flag_delete.order(:datum).accessible_by(current_ability, :show) @toolbar_elements =[] diff --git a/app/views/beispiele/edit.html.erb b/app/views/beispiele/edit.html.erb index 9151086..8ed2cac 100755 --- a/app/views/beispiele/edit.html.erb +++ b/app/views/beispiele/edit.html.erb @@ -1,4 +1,4 @@ -

Editing beispiel

+

Beispiel bearbeiten

<%= notice %>

<%= render 'form' %> From f5cc774c925fd4113ac49c93790f035b15239671 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 16:03:06 +0200 Subject: [PATCH 5/5] AutoCommit Fre Jun 26 16:03:06 CEST 2015 --- app/models/lecturer.rb | 1 + app/models/lva.rb | 3 ++- config/environments/development.rb | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/lecturer.rb b/app/models/lecturer.rb index 8195633..027f47b 100644 --- a/app/models/lecturer.rb +++ b/app/models/lecturer.rb @@ -14,6 +14,7 @@ class Lecturer < ActiveRecord::Base attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link has_and_belongs_to_many :lvas + has_many :beispiele mount_uploader :picture, PictureUploader resourcify diff --git a/app/models/lva.rb b/app/models/lva.rb index 6de47d1..1927fa0 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -44,6 +44,7 @@ class Lva < ActiveRecord::Base has_and_belongs_to_many :modul,:uniq=>true # Gehört zu einem Modul has_and_belongs_to_many :semester has_many :beispiele , :class_name => "Beispiel" + has_and_belongs_to_many :lecturers has_many :nlinks, as: :link has_many :crawlobjects, :as=>:something @@ -56,7 +57,7 @@ class Lva < ActiveRecord::Base validates_presence_of :stunden # Stunden Eingetragen? validates_presence_of :modul # Zugehöriges Modul eingetragen? # (zumindest eines) - + def typ_n typ=="andere" ? "" : typ end diff --git a/config/environments/development.rb b/config/environments/development.rb index 63ff982..53fb4c2 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -15,8 +15,8 @@ Fetsite::Application.configure do # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = true - config.action_mailer.delivery_method =:sendmail - config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' } + config.action_mailer.delivery_method =:sendmail + config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' } # Print deprecation notices to the Rails logger config.active_support.deprecation = :log