08 May, 2013

1 commit


11 Mar, 2013

1 commit


06 Mar, 2013

1 commit


28 Feb, 2013

1 commit


27 Feb, 2013

2 commits


12 Dec, 2012

2 commits


11 Dec, 2012

2 commits


18 Oct, 2012

1 commit


06 Sep, 2012

1 commit


17 Aug, 2012

2 commits


15 Aug, 2012

1 commit


19 Jul, 2012

1 commit


18 Jul, 2012

2 commits


16 Jul, 2012

1 commit


06 Jul, 2012

1 commit

  •   An hidden tag is used to update qualifiers_list in products even when
      said qualifiers_list is empty, so it would behave accordingly with the
      way the qualifiers are added dinamically using javascript and ajax
      (that is, the list represents the content of a product's qualifiers,
      so an empty list means that whatever qualifiers that the product had
      before should be removed). But this tag was overwriting the qualifiers
      and certifiers added by the user, thus making rails believe that the
      qualifiers list was always empty.
    
      I've changed the hidden tag to have a default value 'nil' (which is
      actually a string, but it works; I couldn't find a way to put an
      actual nil value), and when the qualifiers list is updated the method
      inside the model ignores qualifiers whose id value are 'nil'.
    
    (ActionItem2328)
    Larissa Reis
     

20 May, 2012

1 commit


19 May, 2012

1 commit


05 May, 2012

1 commit


17 Apr, 2012

1 commit


15 Apr, 2012

1 commit


05 Apr, 2012

1 commit


03 Apr, 2012

1 commit


15 Mar, 2012

2 commits


24 Feb, 2012

1 commit


21 Feb, 2012

1 commit


20 Feb, 2012

1 commit


19 Feb, 2012

1 commit

  • Conflicts:
    	app/controllers/application.rb
    	app/controllers/public/browse_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/display_helper.rb
    	app/models/environment_finder.rb
    	app/models/product.rb
    	app/views/layouts/_javascript.rhtml
    	app/views/layouts/application-ng.rhtml
    	public/javascripts/application.js
    	public/stylesheets/application.css
    	test/functional/browse_controller_test.rb
    	test/functional/search_controller_test.rb
    	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    Rafael Martins
     

06 Feb, 2012

1 commit


19 Jan, 2012

1 commit


30 Dec, 2011

2 commits

  • Daniela Feitosa
     
  •    * new table production_costs
         * environment and enterprises can have them
       * new table price_details
         * products have price details with a cost and a price
       * updated db/schema
       * included method to display the total value of inputs
       * included partials to display and edit price details
       * allowing users to create new cost from select
       * manage_products.js to separate js codes from application.js
       * numbers_only_javascript
         * created a partial with the js needed to allow only numbers on some fields
      * price composition bar is updated when an user edit some price
    
    (ActionItem1413)
    Daniela Feitosa
     

24 Dec, 2011

3 commits