[Git][noosfero/noosfero][master] 3 commits: Installs ruby-axlsx on orders plugin installation

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
45da9b2b by Gabriel Silva at 2017-02-09T15:59:11+00:00
Installs ruby-axlsx on orders plugin installation

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
4a2e5758 by Gabriel Silva at 2017-02-09T15:59:11+00:00
Adds class namespace to supplier_products relation

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
57b9132f by Rodrigo Souto at 2017-03-06T18:05:08+00:00
Merge branch 'orders_report' into 'master'

Fixes relations namespaces in Orders and Suppliers plugin

Closes #240

See merge request !1110
- - - - -


6 changed files:

- plugins/orders/Gemfile
- plugins/orders/install.rb
- plugins/orders/models/orders_plugin/item.rb
- + plugins/orders/noosfero-jessie-test.list
- plugins/suppliers/lib/ext/products_plugin/product.rb
- plugins/suppliers/models/suppliers_plugin/source_product.rb


Changes:

=====================================
plugins/orders/Gemfile
=====================================
--- a/plugins/orders/Gemfile
+++ b/plugins/orders/Gemfile
@@ -1,2 +1 @@
 gem 'axlsx'#, github: 'randym/axlsx'
-


=====================================
plugins/orders/install.rb
=====================================
--- a/plugins/orders/install.rb
+++ b/plugins/orders/install.rb
@@ -1,3 +1,26 @@
+require 'fileutils'
+
+sources_file = File.join(File.expand_path(File.dirname(__FILE__)), 'noosfero-jessie-test.list')
+repo_url = 'http://download.noosfero.org/debian/jessie-test'
+needs_update = false
+
+unless system "sudo grep -q '#{repo_url}' /etc/apt/sources.list /etc/apt/sources.list.d/*"
+  print 'To install this plugin, you must add noosfero-jessie-test to you sources list, Do you want to proceed? (yes/no): '
+  answer = gets.strip.downcase
+  exit(1) unless answer == 'yes' || answer == 'y'
+
+  puts '>>> Adding Noosfero jessie-test to your sources...'
+  FileUtils.cp(sources_file, '/etc/apt/sources.list.d/')
+  needs_update = true
+end
+
+unless system 'dpkg -s ruby-axlsx'
+  puts '>>> Installing ruby-axlsx...'
+  system 'sudo apt-get update' if needs_update
+  unless system 'sudo apt-get install -y ruby-axlsx'
+    exit $?.exitstatus
+  end
+end
+
 system 'script/noosfero-plugins -q enable products delivery'
 exit $?.exitstatus
-


=====================================
plugins/orders/models/orders_plugin/item.rb
=====================================
--- a/plugins/orders/models/orders_plugin/item.rb
+++ b/plugins/orders/models/orders_plugin/item.rb
@@ -53,7 +53,7 @@ class OrdersPlugin::Item < ApplicationRecord
     has_one :to_product, through: :product
     has_many :sources_supplier_products, through: :product
     has_one :sources_supplier_product, through: :product
-    has_many :supplier_products, through: :product
+    has_many :supplier_products, through: :product, :class_name => "ProductsPlugin::Product"
     has_one :supplier_product, through: :product
     has_many :suppliers, through: :product
     has_one :supplier, through: :product


=====================================
plugins/orders/noosfero-jessie-test.list
=====================================
--- /dev/null
+++ b/plugins/orders/noosfero-jessie-test.list
@@ -0,0 +1,2 @@
+deb http://download.noosfero.org/debian/jessie-test ./
+deb-src http://download.noosfero.org/debian/jessie-test ./


=====================================
plugins/suppliers/lib/ext/products_plugin/product.rb
=====================================
--- a/plugins/suppliers/lib/ext/products_plugin/product.rb
+++ b/plugins/suppliers/lib/ext/products_plugin/product.rb
@@ -1,7 +1,7 @@
 require_dependency 'products_plugin/product'
 
 # FIXME: The lines bellow should be on the core
-class Product
+class ProductsPlugin::Product
 
   extend CurrencyHelper::ClassMethods
   has_currency :price
@@ -36,7 +36,7 @@ class Product
 
 end
 
-class Product
+class ProductsPlugin::Product
 
   attr_accessible :from_products, :from_product, :supplier_id, :supplier
 


=====================================
plugins/suppliers/models/suppliers_plugin/source_product.rb
=====================================
--- a/plugins/suppliers/models/suppliers_plugin/source_product.rb
+++ b/plugins/suppliers/models/suppliers_plugin/source_product.rb
@@ -4,8 +4,8 @@ class SuppliersPlugin::SourceProduct < ApplicationRecord
 
   default_scope -> { includes :from_product, :to_product }
 
-  belongs_to :from_product, class_name: 'Product'
-  belongs_to :to_product, class_name: 'Product'
+  belongs_to :from_product, class_name: 'ProductsPlugin::Product'
+  belongs_to :to_product, class_name: 'ProductsPlugin::Product'
   belongs_to :supplier, class_name: 'SuppliersPlugin::Supplier'
 
   has_many :sources_from_products, through: :from_product



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/9cb9eb95de8f63eb72b7128d9a15d95cc95f736a...57b9132f24c4217c5c903da82f06a14d5b4a7659
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170306/66230255/attachment-0001.html>