diff --git a/back-office/Gemfile.lock b/back-office/Gemfile.lock
index f23ae4e..5ab1f66 100644
--- a/back-office/Gemfile.lock
+++ b/back-office/Gemfile.lock
@@ -231,3 +231,6 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
+
+BUNDLED WITH
+ 1.10.3
diff --git a/back-office/import_validate.log b/back-office/import_validate.log
index 114ebc9..eea38e3 100644
--- a/back-office/import_validate.log
+++ b/back-office/import_validate.log
@@ -7,3 +7,6 @@ I, [2015-05-13T06:59:46.065723 #35530] INFO -- : Import done
I, [2015-05-13T07:00:24.402397 #35642] INFO -- : Item import starting at 2015-05-13 07:00:24 +0200
I, [2015-05-13T07:00:24.402456 #35642] INFO -- : Will be importing items from /Users/senaduka/Downloads/items_for_import.csv
I, [2015-05-13T07:00:37.829898 #35642] INFO -- : Import done
+I, [2015-06-06T08:06:52.737647 #7908] INFO -- : Item import starting at 2015-06-06 08:06:52 +0200
+I, [2015-06-06T08:06:52.738405 #7908] INFO -- : Will be importing items from /home/senadu/Downloads/items_for_import - item_2015-03-21_06h31m33.csv.csv
+I, [2015-06-06T08:06:59.910247 #7908] INFO -- : Import done
diff --git a/front-api/Gemfile.lock b/front-api/Gemfile.lock
index 8c788e8..d954d06 100644
--- a/front-api/Gemfile.lock
+++ b/front-api/Gemfile.lock
@@ -106,3 +106,6 @@ DEPENDENCIES
sinatra
sinatra-activerecord
sinatra-contrib
+
+BUNDLED WITH
+ 1.10.3
diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb
index cac306f..6290743 100644
--- a/front-api/db/schema.rb
+++ b/front-api/db/schema.rb
@@ -129,8 +129,8 @@ ActiveRecord::Schema.define(version: 20150420044444) do
t.datetime "updated_at", null: false
t.string "tags"
t.json "traits"
- t.decimal "weight", precision: 5, scale: 3
t.integer "supplier_id"
+ t.decimal "weight", precision: 5, scale: 3
t.integer "delivery_time_estimation_id"
t.integer "brand_id"
end
diff --git a/front-ui/app/components/items/singleItem.js b/front-ui/app/components/items/singleItem.js
index 5add52e..16a83ca 100644
--- a/front-ui/app/components/items/singleItem.js
+++ b/front-ui/app/components/items/singleItem.js
@@ -1,8 +1,9 @@
var React = require('react');
var ItemActions = require('../../actions/itemActions');
var NavigationActions = require('../../actions/navigationActions');
-var NavigationStore = require('../../stores/navigationStore')
+var NavigationStore = require('../../stores/navigationStore');
+var Globals = require('../../globals');
var Router = require('react-router');
var SingleItem = React.createClass({
@@ -19,7 +20,7 @@ var SingleItem = React.createClass({
{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }{ this.props.item.get('name') }
+
{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }
{ this.props.item.get('name') }{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }{ this.props.item.get('name') }
- { this.props.item.get('brand') ? this.props.item.get('brand').name : '' }
+
{ this.props.item.get('name') }