Fix PR #600

metasfresh · May 26, 2017 · bf49f20 · bf49f20
1 parent ed4b32b
commit bf49f20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/assets/css/inputs.css b/src/assets/css/inputs.css
@@ -768,6 +768,11 @@ input:checked + .input-slider:before {
     color: $brand-font-color;
     background-color: $brand-danger-color !important;
 }
+.input-error .input-dropdown-list-option.input-dropdown-list-option-key-on,
+.input-error .input-dropdown-list-option.input-dropdown-list-option-key-on * {
+    color: $brand-font-color;
+    background-color: $brand-danger-color !important;
+}
 .input-dropdown-list-option p {
     margin:0;
     overflow: hidden;
@@ -991,7 +996,3 @@ table .rdtPicker table td,
     vertical-align: middle;
     padding: 0;
 }
-.Lookup .input-icon {
-    height: 16px;
-    bottom: 0;
-}
diff --git a/src/components/widget/Lookup/Lookup.js b/src/components/widget/Lookup/Lookup.js
@@ -131,7 +131,8 @@ class Lookup extends Component {
                 properties && properties.map((item, index) => {
                         const disabled = isInputEmpty && index != 0;
 
-                        if(item.source === 'lookup'){
+                        if(item.source === 'lookup' ||
+                            item.widgetType === 'Lookup'){
                             return <RawLookup
                                 key={index}
                                 newRecordCaption={newRecordCaption}
@@ -148,7 +149,8 @@ class Lookup extends Component {
                                 windowType, parameterName, entity, dataId,
                                 isModal, recent, rank, updated, filterWidget,
                                 mandatory, validStatus, align, onChange, item,
-                                disabled, fireClickOutside}}
+                                disabled, fireClickOutside, viewId, subentity,
+                                subentityId}}
                             />
 
                         } else if (item.source === 'list') {