Commitf5206b8

and

authored

OBPIH-6993 fix3. filter multiple products when downloading transactio… (#5580)

Co-authored-by: Kacper Chełstowski <kchelstowski@soldevelo.com>

1 parent59e3efb commitf5206b8Copy full SHA for f5206b8

File tree

-9

lines changed

grails-app
- controllers/org/pih/warehouse
  - JsonController.groovy
- views/report
  - showTransactionReport.gsp

-9

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1814,13 +1814,5 @@ class TransactionReportCommand implements Validateable {`
`1814`	`1814`	`Location location`
`1815`	`1815`	`List<TransactionType> transactionTypes`
`1816`	`1816`	`Category category`
`1817`		`-`
`1818`		`-// TODO: The datatables plugin sends the ids as a single string (ex: products="1,2") so we need to split it up`
`1819`		`-// ourselves. Better would be to modify the usage of datatables to send up each id as a separate field`
`1820`		`-// (ex: products="1"&products="2") so that Grails can bind it normally. (see showTransactionReport.gsp)`
`1821`		`-@BindUsing({ obj, source ->`
`1822`		`-List<String>productIds= (source['products'] asString)?.split(',')`
`1823`		`-return productIds?Product.findAllByIdInList(productIds):null`
`1824`		`- })`
`1825`	`1817`	`List<Product> products`
`1826`	`1818`	`}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,14 @@`
`259`	`259`	`data.push({ name:"startDate", value:$("#startDate").val() });`
`260`	`260`	`data.push({ name:"endDate", value:$("#endDate").val() });`
`261`	`261`	`data.push({ name:"category", value:$("#category").val() });`
`262`		`-data.push({ name:"products", value:$("#products-select").val() });`
	`262`	`+`
	`263`	`+constselectedProducts=$("#products-select").val();`
	`264`	`+if (selectedProducts) {`
	`265`	`+selectedProducts.forEach(productId=> {`
	`266`	`+data.push({ name:"products", value: productId });`
	`267`	`+ });`
	`268`	`+ }`
	`269`	`+`
`263`	`270`	`data.push({ name:"tags", value:$("#tags").val() });`
`264`	`271`	`data.push({ name:"catalogs", value:$("#catalogs").val() });`
`265`	`272`	`if($('#includeCategoryChildren').is(':checked')) {`

Comments

(0)