Refs #5750 @1h; Manage non-commercial StopAreas

- Add a `kind` attribute
- Hide irrelevant fields in the form

2 files changed, 7 insertions, 5 deletions

diff --git a/app/javascript/helpers/master_slave.coffee b/app/javascript/helpers/master_slave.coffee
index 11f6bca7e..4866a55e3 100644
--- a/app/javascript/helpers/master_slave.coffee
+++ b/app/javascript/helpers/master_slave.coffee
@@ -3,16 +3,16 @@ class MasterSlave
     $(selector).find('[data-master]').each (i, slave)->
       $slave = $(slave)
       master = $($slave.data().master)
-      console.log $slave.data().master
-      console.log master
+      console.log $slave
+      console.log $slave.find("input:disabled, select:disabled")
+      $slave.find("input:disabled, select:disabled").attr "data-slave-force-disabled", "true"
       toggle = ->
         val = master.filter(":checked").val() if master.filter("[type=radio]").length > 0
         val ||= master.val()
         selected = val == $slave.data().value
         $slave.toggle selected
-        $slave.find("input, select").attr "disabled", !selected
+        $slave.find("input, select").filter(":not([data-slave-force-disabled])").attr "disabled", !selected
       master.change toggle
       toggle()
-      # $slave.toggle master.val() == $slave.data().value
 
 export default MasterSlave
diff --git a/app/javascript/helpers/stop_area_header_manager.js b/app/javascript/helpers/stop_area_header_manager.js
index c9f397dee..2c820caf9 100644
--- a/app/javascript/helpers/stop_area_header_manager.js
+++ b/app/javascript/helpers/stop_area_header_manager.js
@@ -19,7 +19,7 @@ export default class StopAreaHeaderManager {
       <div
         className={(showHeadline) ? 'headlined' : ''}
         data-headline={showHeadline}
-        title={sp.city_name + ' (' + sp.zip_code +')'}
+        title={sp.city_name ? sp.city_name + ' (' + sp.zip_code +')' : ""}
       >
         <span>
           <span>
@@ -27,6 +27,8 @@ export default class StopAreaHeaderManager {
             {sp.time_zone_formatted_offset && <span className="small">
               &nbsp;({sp.time_zone_formatted_offset})
             </span>}
+            {sp.area_kind == 'non_commercial' && <span className="fa fa-question-circle" title={sp.area_type_i18n}>
+            </span>}
           </span>
         </span>
       </div>