c80_news_tz 0.1.1.15 → 0.1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c20f9594fbbe051876b9634c02ffea4b09d41aa
-  data.tar.gz: bdfd17888df61ac487a59f9d7a38d3ff4f493cc7
+  metadata.gz: 26125a7e49af2991e638979c7f5df740775831e0
+  data.tar.gz: 83f7bfa87b315b1b215a044f4c9d689d428515d0
 SHA512:
-  metadata.gz: 74897617e0613cc2b5ca6dc5c0fa87170e3bc18947fe54c9193f584c0383b85a5db322a683e552bad687292dea2d2139199e099126b448479e48e85700514d69
-  data.tar.gz: bd5f68976b44438e69c1b9c6aa70dabdcd7cf0c81485883ab353cfcff45752e9d6b793c40f42a162da7e234ea231a86974cfcb4151f7e6c59656341da7cc6471
+  metadata.gz: a2f6a42ab356be29fd8fa9b75aafc8a96cf727d7afcf1c6d0421ea8af926e6c029a3b4700f9a17629d38c0ed7ea772c426a090d7b9ceb0895ba4c428c5108725
+  data.tar.gz: f2b136bb79682ea4698995a5af228371851fdbf52f8c62e6e129c007ccf9912f7c9afe259390e78dc0326f6f615070aab97d9063f26f22fc4f62da77e5de1042

data/app/admin/c80_news_tz/spots.rb

@@ -0,0 +1,43 @@
+ActiveAdmin.register C80NewsTz::Spot, :as => 'Spot' do
+
+  menu :label => "Рубрики на главной", :parent => 'Содержимое сайта'
+
+  before_filter :skip_sidebar!, :only => :index
+
+  permit_params :rubric_ids => []
+
+  config.sort_order = 'id_asc'
+
+  index do
+    id_column
+    column :title
+
+    column :rubrics do |loc|
+      # нарисуем список
+      list_items = ((loc.rubrics.map { |p|
+        "<li>• #{ p.title } <a href='/rubrics/#{p.slug}' target='_blank'>[view]</a> <a href='/admin/rubrics/#{p.slug}/edit'>[edit]</a> </li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+    f.inputs "Свойства" do
+      f.input :title
+
+      f.input :rubrics,
+              :as => :select,
+              :input_html => {:multiple => false},
+              :include_blank => true,
+              :member_label => Proc.new { |p|
+                p.title
+              }
+
+    end
+    f.actions
+  end
+
+end

data/app/models/c80_news_tz/rubric.rb

@@ -1,6 +1,8 @@
 require "babosa"
 module C80NewsTz
   class Rubric < ActiveRecord::Base
+    has_and_belongs_to_many :spots, :join_table => 'c80_news_tz_rubrics_spots'
+
     validates_with RubricValidator
 
     extend FriendlyId
@@ -21,5 +23,30 @@ module C80NewsTz
       # name_changed? || super
     end
 
+    # выдать массив рубрик, которые должны выводиться на главной
+    def self.select_all_in_spots
+      s = "
+        SELECT
+          `c80_news_tz_rubrics`.*,
+          `c80_news_tz_spots`.`id` AS `spot_id`
+        FROM `c80_news_tz_rubrics`
+          INNER JOIN `c80_news_tz_rubrics_spots` ON `c80_news_tz_rubrics_spots`.`rubric_id` = `c80_news_tz_rubrics`.`id`
+          INNER JOIN `c80_news_tz_spots` ON `c80_news_tz_spots`.`id` = `c80_news_tz_rubrics_spots`.`spot_id`
+        ORDER BY `spot_id`;
+      "
+      result = self.find_by_sql(s)
+      result
+
+    end
+
+    # выдать публикации из этой рубрики
+    def pubs(lim = nil)
+      if lim.nil?
+        C80NewsTz::Fact.joins(:rubrics).where(:c80_news_tz_rubrics => {:title => self.title})
+      else
+        C80NewsTz::Fact.joins(:rubrics).where(:c80_news_tz_rubrics => {:title => self.title}).limit(lim)
+      end
+    end
+
   end
 end

data/app/models/c80_news_tz/spot.rb

@@ -0,0 +1,6 @@
+# Место под рубрику на главной
+module C80NewsTz
+  class Spot < ActiveRecord::Base
+    has_and_belongs_to_many :rubrics, :join_table => 'c80_news_tz_rubrics_spots'
+  end
+end

data/db/migrate/20160307075757_create_spots.rb

@@ -0,0 +1,10 @@
+class CreateSpots < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_spots, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :tag
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160307075858_create_join_table_rubrics_spots.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableRubricsSpots < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_rubrics_spots, :id => false do |t|
+      t.integer :rubric_id, :null => false
+      t.integer :spot_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_rubrics_spots, [:rubric_id, :spot_id], :unique => true
+
+  end
+end

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.15"
+  VERSION = "0.1.1.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.15
+  version: 0.1.1.16
 platform: ruby
 authors:
 - C80609A
@@ -100,6 +100,7 @@ files:
 - app/admin/c80_news_tz/locations.rb
 - app/admin/c80_news_tz/notices.rb
 - app/admin/c80_news_tz/rubrics.rb
+- app/admin/c80_news_tz/spots.rb
 - app/assets/images/c80_news_tz/.keep
 - app/assets/javascripts/c80_news_tz/application.js.coffee
 - app/assets/javascripts/c80_news_tz/backend.js.coffee
@@ -131,6 +132,7 @@ files:
 - app/models/c80_news_tz/prop.rb
 - app/models/c80_news_tz/rubric.rb
 - app/models/c80_news_tz/rubric_validator.rb
+- app/models/c80_news_tz/spot.rb
 - app/uploaders/c80_news_tz/clogo_uploader.rb
 - app/uploaders/c80_news_tz/cphoto_uploader.rb
 - app/uploaders/c80_news_tz/fphoto_uploader.rb
@@ -166,6 +168,8 @@ files:
 - db/migrate/20160227121416_create_nphotos.rb
 - db/migrate/20160304145554_create_locations.rb
 - db/migrate/20160304145555_create_join_table_facts_locations.rb
+- db/migrate/20160307075757_create_spots.rb
+- db/migrate/20160307075858_create_join_table_rubrics_spots.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example