add show_in_grid flag in webform

This commit is contained in:
Prateeksha Singh 2018-08-02 19:47:36 +05:30
parent 6c80e56532
commit b2d1f00e50
5 changed files with 1276 additions and 1245 deletions

View file

@ -62,12 +62,17 @@
</p>
</div>
{% elif is_list %}
<div class="web-form-list">
<div class="results"></div>
<div class="more-block {% if not show_more -%} hide {%- endif %}">
<button class="btn btn-default btn-more btn-sm">{{ _("More") }}</button>
{% if show_in_grid %}
<div class="web-form-list">
<div class="results"></div>
<div class="more-block {% if not show_more -%} hide {%- endif %}">
<button class="btn btn-default btn-more btn-sm">{{ _("More") }}</button>
</div>
</div>
</div>
{% else %}
{% include "templates/includes/list/list.html" %}
<script>{% include "templates/includes/list/list.js" %}</script>
{% endif %}
{% else %}
<br>

View file

@ -0,0 +1,23 @@
/* eslint-disable */
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
QUnit.test("test: Web Form", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
// insert a new Web Form
() => frappe.tests.make('Web Form', [
// values to be set
{key: 'value'}
]),
() => {
assert.equal(cur_frm.doc.key, 'value');
},
() => done()
]);
});

File diff suppressed because it is too large Load diff

View file

@ -171,6 +171,8 @@ def get_context(context):
if not context.max_attachment_size:
context.max_attachment_size = get_max_file_size() / 1024 / 1024
context.show_in_grid = self.show_in_grid
def load_document(self, context):
'''Load document `doc` and `layout` properties for template'''
if frappe.form_dict.name or frappe.form_dict.new:

View file

@ -4,7 +4,9 @@ import DataTable from 'frappe-datatable';
frappe.ready(function() {
if(web_form_settings.is_list) {
$('body').show();
make_datatable('.web-form-list .results', web_form_settings.web_form_doctype);
if($('.web-form-list').length) {
make_datatable('.web-form-list .results', web_form_settings.web_form_doctype);
}
return;
}