From 5d4762f9426d74970d481614e64f9e6e5f6fb835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Thu, 20 Aug 2015 11:03:00 +0200
Subject: [PATCH] fix lock functionality bug

---
 js/components/ascribe_forms/form.js                        | 2 +-
 js/components/ascribe_forms/form_loan.js                   | 6 ++++--
 js/components/ascribe_forms/property.js                    | 7 +++++++
 js/components/ascribe_slides_container/slides_container.js | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js
index 8522825c..12e4ebae 100644
--- a/js/components/ascribe_forms/form.js
+++ b/js/components/ascribe_forms/form.js
@@ -210,7 +210,7 @@ let Form = React.createClass({
 
                     // We need this in order to make editable be overridable when setting it directly
                     // on Property
-                    editable: typeof child.props.editable !== 'undefined' ? child.props.editable : !this.props.disabled
+                    editable: child.props.overrideForm ? child.props.editable : !this.props.disabled
                 });
             }
         });
diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index 3fc6bd6e..201ba174 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -147,7 +147,8 @@ let LoanForm = React.createClass({
                     name='loanee'
                     label={getLangText('Loanee Email')}
                     onBlur={this.handleOnBlur}
-                    editable={!this.props.email}>
+                    editable={!this.props.email}
+                    overrideForm={!this.props.email}>
                     <input
                         value={this.props.email}
                         type="email"
@@ -157,7 +158,8 @@ let LoanForm = React.createClass({
                 <Property
                     name='gallery_name'
                     label={getLangText('Gallery/exhibition (optional)')}
-                    editable={!this.props.gallery}>
+                    editable={!this.props.gallery}
+                    overrideForm={!this.props.gallery}>
                     <input
                         value={this.props.gallery}
                         type="text"
diff --git a/js/components/ascribe_forms/property.js b/js/components/ascribe_forms/property.js
index acb38234..cfc4c4d9 100644
--- a/js/components/ascribe_forms/property.js
+++ b/js/components/ascribe_forms/property.js
@@ -11,7 +11,14 @@ import { mergeOptions } from '../../utils/general_utils';
 let Property = React.createClass({
     propTypes: {
         hidden: React.PropTypes.bool,
+
         editable: React.PropTypes.bool,
+
+        // If we want Form to have a different value for disabled as Property has one for
+        // editable, we need to set overrideForm to true, as it will then override Form's
+        // disabled value for individual Properties
+        overrideForm: React.PropTypes.bool,
+
         tooltip: React.PropTypes.element,
         label: React.PropTypes.string,
         value: React.PropTypes.oneOfType([
diff --git a/js/components/ascribe_slides_container/slides_container.js b/js/components/ascribe_slides_container/slides_container.js
index ea329ca2..b479404b 100644
--- a/js/components/ascribe_slides_container/slides_container.js
+++ b/js/components/ascribe_slides_container/slides_container.js
@@ -172,7 +172,7 @@ let SlidesContainer = React.createClass({
         let breadcrumbs = [];
 
         ReactAddons.Children.map(this.props.children, (child, i) => {
-            if(i >= this.state.startFrom) {
+            if(i >= this.state.startFrom && child.props['data-slide-title']) {
                 breadcrumbs.push(child.props['data-slide-title']);
             }
         });