Merge pull request #2145 from kobotoolbox/2137-nested-repeat-submission-detail-crash

Nested repeat submission detail crash - quickfix

Author: jnm

jsapp/js/components/modalForms/submission.es6

@@ -263,6 +263,13 @@ class Submission extends React.Component {
       case 'video':
         return this.renderAttachment(submissionValue, q.type);
         break;
+      case 'begin_repeat':
+        const list = submissionValue.map((r) => {
+          const stringified = JSON.stringify(r);
+          return <li key={stringified}>{stringified}</li>
+        });
+        return <ul>{list}</ul>
+        break;
       default:
         return submissionValue;
         break;

jsapp/xlform/src/view.row.coffee

@@ -13,6 +13,7 @@ $acceptedFilesView = require './view.acceptedFiles'
 $viewRowDetail = require './view.rowDetail'
 renderKobomatrix = require('js/formbuild/renderInBackbone').renderKobomatrix
 _t = require('utils').t
+alertify = require 'alertifyjs'
 
 module.exports = do ->
   class BaseRowView extends Backbone.View
@@ -193,7 +194,7 @@ module.exports = do ->
           $appearanceField.find('input:checkbox').prop('checked', false)
           appearanceModel = @model.get('appearance')
           if appearanceModel.getValue()
-            @surveyView.ngScope.miscUtils.alert(_t("You can't display nested groups on the same screen - the setting has been removed from the parent group"))
+            alertify.warning(_t("You can't display nested groups on the same screen - the setting has been removed from the parent group"))
           appearanceModel.set('value', '')
 
       @model.on 'remove', (row) =>

jsapp/xlform/src/view.surveyApp.coffee

@@ -11,6 +11,7 @@ $rowView = require './view.row'
 $baseView = require './view.pluggedIn.backboneView'
 $viewUtils = require './view.utils'
 _t = require('utils').t
+alertify = require 'alertifyjs'
 
 module.exports = do ->
   surveyApp = {}
@@ -681,16 +682,8 @@ module.exports = do ->
           enketoServer: window.koboConfigs?.enketoServer or false
           enketoPreviewUri: window.koboConfigs?.enketoPreviewUri or false
           onSuccess: => @onEscapeKeydown = $viewUtils.enketoIframe.close
-          onError: (message, opts)=> @alert message, opts
+          onError: (message)=> alertify.error(message)
       return
-
-    alert: (message, opts={}) ->
-      title = opts.title or 'Error'
-      $('.alert-modal').html(message).dialog('option', {
-        title: title,
-        width: 500,
-        dialogClass: 'surveyapp__alert'
-      }).dialog 'open'
     downloadButtonClick: (evt)->
       # Download = save a CSV file to the disk
       surveyCsv = @survey.toCSV()