Merge pull request #2602 from kobotoolbox/fix-group-labels-not-saving

Fix group labels not saving
kobotoolbox · Mar 31, 2020 · 73e98e2 · 73e98e2
2 parents f94f7c0 + be818f1
commit 73e98e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/jsapp/xlform/src/view.row.coffee b/jsapp/xlform/src/view.row.coffee
@@ -70,7 +70,7 @@ module.exports = do ->
       @
     _renderRow: ->
       @$el.html $viewTemplates.$$render('row.xlfRowView', @surveyView)
-      @$label = @$('.card__header-title')
+      @$label = @$('.js-card-label')
       @$hint = @$('.card__header-hint')
       @$card = @$('.card')
       @$header = @$('.card__header')
@@ -164,7 +164,7 @@ module.exports = do ->
     render: ->
       if !@already_rendered
         @$el.html $viewTemplates.row.groupView(@model)
-        @$label = @$('.card__header-title')
+        @$label = @$('.js-card-label')
         @$rows = @$('.group__rows').eq(0)
         @$card = @$('.card')
         @$header = @$('.card__header,.group__header').eq(0)
@@ -268,7 +268,7 @@ module.exports = do ->
       @$el.html $viewTemplates.row.koboMatrixView()
       @matrix = @$('.card__kobomatrix')
       renderKobomatrix(@, @matrix)
-      @$label = @$('.card__header-title')
+      @$label = @$('.js-card-label')
       @$card = @$('.card')
       @$header = @$('.card__header')
       context = {warnings: []}

diff --git a/jsapp/xlform/src/view.row.templates.coffee b/jsapp/xlform/src/view.row.templates.coffee
@@ -62,7 +62,7 @@ module.exports = do ->
             <div class="noop card__indicator__icon"><i class="fa fa-fw card__header-icon"></i></div>
           </div>
           <div class="card__text">
-            <input type="text" placeholder="#{_t("Question label is required")}" class="card__header-title js-cancel-select-row js-cancel-sort">
+            <input type="text" placeholder="#{_t("Question label is required")}" class="card__header-title js-card-label js-cancel-select-row js-cancel-sort">
             <input type="text" placeholder="#{_t("Question hint")}" class="card__header-hint js-cancel-select-row js-cancel-sort">
           </div>
           <div class="card__buttons">
@@ -85,7 +85,7 @@ module.exports = do ->
     <div class="survey__row__item survey__row__item--group group card js-select-row">
       <header class="group__header">
         <i class="group__caret js-toggle-group-expansion fa fa-fw fa-caret-down"></i>
-        <input type="text" class="js-cancel-select-row js-cancel-sort">
+        <input type="text" class="card__header-title js-card-label js-cancel-select-row js-cancel-sort">
         <div class="group__header__buttons">
           <span class="group__header__buttons__button group__header__buttons__button--settings js-toggle-card-settings"><i class="fa fa-cog"></i></span>
           <span class="group__header__buttons__button group__header__buttons__button--delete js-delete-group"><i class="fa fa-trash-o"></i></span>
@@ -106,7 +106,7 @@ module.exports = do ->
             <div class="noop card__indicator__icon"><i class="fa fa-fw card__header-icon fa-table"></i></div>
           </div>
           <div class="card__text">
-            <input type="text" placeholder="#{_t("Question label is required")}" class="card__header-title js-cancel-select-row js-cancel-sort">
+            <input type="text" placeholder="#{_t("Question label is required")}" class="card__header-title js-card-label js-cancel-select-row js-cancel-sort">
           </div>
           <div class="card__buttons">
             <span class="card__buttons__button card__buttons__button--settings card__buttons__button--gray js-toggle-card-settings" data-button-name="settings"><i class="fa fa-cog"></i></span>

diff --git a/test/xlform/integration.tests.coffee b/test/xlform/integration.tests.coffee
@@ -176,7 +176,7 @@ do ->
         """
       it 'for calculation question through the interface', ->
         click_set_val = (v)->
-          survey_row.find('.card__header-title').eq(0).click()
+          survey_row.find('.js-card-label').eq(0).click()
           inp = survey_row.find('input').eq(0)
           inp.val(v)
           inp.blur()
@@ -199,9 +199,9 @@ do ->
 
         survey_row = @div.find('.survey__row').eq(-1)
 
-        expect(survey_row.find('.card__header-title').text()).toBe("4 + 4")
+        expect(survey_row.find('.js-card-label').text()).toBe("4 + 4")
         click_set_val("5 + 5")
-        expect(survey_row.find('.card__header-title').text()).toBe("5 + 5")
+        expect(survey_row.find('.js-card-label').text()).toBe("5 + 5")
 
         expectedLastRow =
           type: 'calculate'