diff --git a/app/controllers/crawler_controller.rb b/app/controllers/crawler_controller.rb index 25e571a..c5a9903 100644 --- a/app/controllers/crawler_controller.rb +++ b/app/controllers/crawler_controller.rb @@ -4,6 +4,8 @@ class CrawlerController < ApplicationController authorize! :doadmin, User @crawlobjs=Crawlobject.where(:objtype=>5).order(:published_at).reverse_order + @crawlobjs_etit=Crawlobject.where(:objtype=>6).order(:published_at).reverse_order + end def load_attachments authorize! :doadmin, User @@ -21,9 +23,11 @@ class CrawlerController < ApplicationController authorize! :doadmin, User co=Crawlobject.find(params[:id]) - if co.objtype == 5 - co.move_to_neuigkeit(User.find(Rails.configuration.crawlconfig[5]["user_id"]), Rubrik.find(Rails.configuration.crawlconfig[5]["rubrik_id"])) + if co.objtype == 5 || co.objtype==6 + co.move_to_neuigkeit(User.find(Rails.configuration.crawlconfig[co.objtype]["user_id"]), Rubrik.find(Rails.configuration.crawlconfig[co.objtype]["rubrik_id"])) redirect_to co.something end + + end end diff --git a/app/models/crawlobject.rb b/app/models/crawlobject.rb index 4b00a7c..da31d88 100644 --- a/app/models/crawlobject.rb +++ b/app/models/crawlobject.rb @@ -15,7 +15,7 @@ class Crawlobject < ActiveRecord::Base end end def move_to_neuigkeit(user,rubrik) - if self.objtype == 5 and self.something.nil? + if ( self.objtype == 5 || self.objtype == 6 )and self.something.nil? n=Neuigkeit.new n.title=self.name n.text=self.text @@ -27,7 +27,7 @@ class Crawlobject < ActiveRecord::Base self.something=n self.save return n - elsif self.objtype == 5 + elsif ( self.objtype == 5 || self.objtype==6) n=self.something n.title=self.name n.text=self.text diff --git a/app/views/crawler/index.html.erb b/app/views/crawler/index.html.erb index 08eeeb1..6d271a4 100644 --- a/app/views/crawler/index.html.erb +++ b/app/views/crawler/index.html.erb @@ -1,9 +1,39 @@

HTU News

- -<% @crawlobjs.each do |co| %> - -<% end %> -
<%= render co %> -<%= link_to "move_to_news",move_to_news_crawler_path(co) %> -<%= render co.something unless co.something.nil? %> -
+ +
+ + +
+ + <% @crawlobjs.each do |co| %> + + + + + <% end %> +
<%= render co %> + <%= link_to "move_to_news",move_to_news_crawler_path(co) %> + <%= render co.something unless co.something.nil? %> +
+ +
+
+ + <% @crawlobjs_etit.each do |co| %> + + + + + <% end %> +
<%= render co %> + <%= link_to "move_to_news",move_to_news_crawler_path(co) %> + <%= render co.something unless co.something.nil? %> +
+ +
+ +
+