[Git][noosfero/noosfero][stable-1.8] Merge branch 'fix-suppliers-plugin' into 'master'

Rodrigo Souto gitlab at mg.gitlab.com
Thu Jun 29 14:01:26 BRT 2017 

Rodrigo Souto pushed to branch stable-1.8 at Noosfero / noosfero


Commits:
c7237425 by Rodrigo Souto at 2017-06-29T17:01:07+00:00
Merge branch 'fix-suppliers-plugin' into 'master'

Fix suppliers plugin

Closes #247 and #248

See merge request !1247
- - - - -


9 changed files:

- plugins/orders/public/stylesheets/_actions.scss
- plugins/orders/public/stylesheets/_filter.scss
- plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
- plugins/suppliers/lib/ext/products_plugin/product.rb
- plugins/suppliers/lib/suppliers_plugin/base.rb
- plugins/suppliers/views/suppliers_plugin/manage_products/_compare_tab.html.slim
- plugins/suppliers/views/suppliers_plugin/product/_edit.html.slim
- plugins/suppliers/views/suppliers_plugin/product/add.html.slim
- plugins/suppliers/views/suppliers_plugin_myprofile/_supplier.html.erb


Changes:

=====================================
plugins/orders/public/stylesheets/_actions.scss
=====================================
--- a/plugins/orders/public/stylesheets/_actions.scss
+++ b/plugins/orders/public/stylesheets/_actions.scss
@@ -6,8 +6,6 @@ $actions-bg: #D7FFB9;
   background: $actions-bg;
 
   &.wireframe-size {
-    margin-left: -($wireframe-padding);
-    margin-right: -($wireframe-padding);
     padding: $padding ($wireframe-padding + $padding);
   }
 


=====================================
plugins/orders/public/stylesheets/_filter.scss
=====================================
--- a/plugins/orders/public/stylesheets/_filter.scss
+++ b/plugins/orders/public/stylesheets/_filter.scss
@@ -15,8 +15,6 @@ $filter-bg: #BCDC91;
   }
 
   &.wireframe-size {
-    margin-left: -($wireframe-padding);
-    margin-right: -($wireframe-padding);
 
     .title, .filter-box, .submit {
       padding-left: $wireframe-padding + $padding;


=====================================
plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
=====================================
--- a/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
+++ b/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
@@ -27,7 +27,6 @@ class SuppliersPlugin::ProductController < MyProfileController
   end
 
   def add
-
   end
 
   def edit
@@ -50,7 +49,7 @@ class SuppliersPlugin::ProductController < MyProfileController
   end
 
   def destroy
-    @product = SuppliersPlugin::DistributedProduct.find params[:id]
+    @product = Product.find params[:id]
     @product.destroy
     flash[:notice] = t('controllers.myprofile.product_controller.product_removed_succe')
   end
@@ -84,7 +83,7 @@ class SuppliersPlugin::ProductController < MyProfileController
     @scope = SuppliersPlugin::BaseProduct.search_scope @scope, params
     @products_count = @scope.supplied_for_count.count
     @scope = @scope.supplied.select('products.*, MIN(from_products_products.name) as from_products_name').order('from_products_name ASC')
-    @products = @scope.paginate per_page: 20, page: page
+    @products = (@scope | profile.products).paginate per_page: 20, page: page
 
     @product_categories = Product.product_categories_of @products
     @new_product = SuppliersPlugin::DistributedProduct.new


=====================================
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
@@ -3,6 +3,9 @@ require_dependency 'products_plugin/product'
 # FIXME: The lines bellow should be on the core
 class ProductsPlugin::Product
 
+  attr_accessible :default_margin_percentage, :margin_percentage, :default_unit, :unit_detail,
+    :supplier_product_attributes
+
   extend CurrencyFields::ClassMethods
   has_currency :price
   has_currency :discount


=====================================
plugins/suppliers/lib/suppliers_plugin/base.rb
=====================================
--- a/plugins/suppliers/lib/suppliers_plugin/base.rb
+++ b/plugins/suppliers/lib/suppliers_plugin/base.rb
@@ -46,9 +46,6 @@ class SuppliersPlugin::Base < Noosfero::Plugin
   end
 
   def control_panel_buttons
-    # FIXME: disable for now
-    return
-
     profile = context.profile
     return unless profile.enterprise?
     [


=====================================
plugins/suppliers/views/suppliers_plugin/manage_products/_compare_tab.html.slim
=====================================
--- a/plugins/suppliers/views/suppliers_plugin/manage_products/_compare_tab.html.slim
+++ b/plugins/suppliers/views/suppliers_plugin/manage_products/_compare_tab.html.slim
@@ -9,10 +9,10 @@
 div
   - if @product.profile != @product.from_product.profile
     = button nil, t('suppliers_plugin.views.manage_products.compare_tab.see_supplier', supplier: @product.from_product.profile.name),
-      {controller: :manage_products, profile: @product.from_product.profile.identifier, action: :show, id: @product.from_product.id},
+      {controller: 'products_plugin/page', profile: @product.from_product.profile.identifier, action: :show, id: @product.from_product.id},
       target: '_blank'
   - else
     = button nil, t('suppliers_plugin.views.manage_products.compare_tab.see'),
-      {controller: :manage_products, action: :show, id: @product.from_product.id},
+      {controller: 'products_plugin/page', action: :show, id: @product.from_product.id},
       target: '_blank'
 


=====================================
plugins/suppliers/views/suppliers_plugin/product/_edit.html.slim
=====================================
--- a/plugins/suppliers/views/suppliers_plugin/product/_edit.html.slim
+++ b/plugins/suppliers/views/suppliers_plugin/product/_edit.html.slim
@@ -71,7 +71,7 @@
 
   .links
     = link_to t('views.product._edit.product_registry'),
-      {controller: :manage_products, action: :show, id: product.id},
+      {controller: 'products_plugin/page', action: :show, id: product.id},
       target: '_blank', class: 'action-button registry'
 
 javascript:


=====================================
plugins/suppliers/views/suppliers_plugin/product/add.html.slim
=====================================
--- a/plugins/suppliers/views/suppliers_plugin/product/add.html.slim
+++ b/plugins/suppliers/views/suppliers_plugin/product/add.html.slim
@@ -2,7 +2,7 @@ div.popin
   h1= t'views.product.add.title'
 
   div
-    = button :new, t('views.product.add.own_product'), {controller: :manage_products, profile: profile.identifier, action: :new},
+    = button :new, t('views.product.add.own_product'), {controller: 'products_plugin/page', profile: profile.identifier, action: :new},
       target: '_blank', onclick: 'noosfero.modal.close()'
     | 
     = t'views.product.add.or_from_a_supplier'
@@ -10,7 +10,7 @@ div.popin
 
   div
     - profile.suppliers.dummy.except_self.alphabetical.each do |supplier|
-      = link_to({controller: :manage_products, profile: supplier.profile.identifier, action: :new},
+      = link_to({controller: 'products_plugin/page', profile: supplier.profile.identifier, action: :new},
         target: '_blank', onclick: 'noosfero.modal.close()') do
         = profile_image supplier, :icon
         = supplier.abbreviation_or_name


=====================================
plugins/suppliers/views/suppliers_plugin_myprofile/_supplier.html.erb
=====================================
--- a/plugins/suppliers/views/suppliers_plugin_myprofile/_supplier.html.erb
+++ b/plugins/suppliers/views/suppliers_plugin_myprofile/_supplier.html.erb
@@ -48,8 +48,8 @@
     <div><%= link_to_remote t('views.supplier._supplier.disassociate'), :url => {:action => :destroy, :id => supplier.id},
       :confirm => t('views.supplier._supplier.by_removing_this_supp'), :class => 'supplier-remove' %></div>
 
-    <div><%= link_to t('views.supplier._supplier.manage_products'), {controller: 'suppliers_plugin/product', action: :index, supplier_id: supplier.id}, target: '_blank' %></div>
-    <div><%= link_to t('views.supplier._supplier.add_product'), {controller: :manage_products, profile: supplier.profile.identifier, action: :new}, target: '_blank' %></div>
+    <div><%= link_to t('views.supplier._supplier.products'), {controller: 'suppliers_plugin/product', action: :index, supplier_id: supplier.id}, target: '_blank' %></div>
+    <div><%= link_to t('views.supplier._supplier.add_product'), {controller: 'products_plugin/page', profile: supplier.profile.identifier, action: :new}, target: '_blank' %></div>
   </div>
 </div>
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c72374252a5cda8ede104126581b00afe5e80b97

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c72374252a5cda8ede104126581b00afe5e80b97
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170629/79bfff11/attachment-0001.html>

More information about the Noosfero-dev mailing list