Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Olmis 5893 #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Olmis 5893 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b09a2
show correct notification when product list is empty when adding/edit…
msomierick Dec 8, 2020
ad1a40d
update changelog with v5.6.5 changes
msomierick Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
5.6.5 / WIMP
============

Bug fixes:
* [OLMIS-5893](hhttps://openlmis.atlassian.net/browse/OLMIS-5893): Fix wrong product notification when adding/editing associations.

5.6.4 / 2020-11-17
==================

Expand Down
2 changes: 1 addition & 1 deletion src/admin-supply-partner-edit/association-modal.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
return 'adminSupplyPartnerEdit.associationEmptyFacilities';
}
if (!vm.association.orderables || vm.association.orderables < 1) {
return 'adminSupplyPartnerEdit.associationEmptyOrderables';
return 'adminSupplyPartnerEdit.associationEmptyProducts';
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/admin-supply-partner-edit/association-modal.controller.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,14 +763,14 @@ describe('AssociationModalController', function() {
this.vm.association.orderables = undefined;
this.vm.addAssociation();

expect(this.alertService.error).toHaveBeenCalledWith('adminSupplyPartnerEdit.associationEmptyOrderables');
expect(this.alertService.error).toHaveBeenCalledWith('adminSupplyPartnerEdit.associationEmptyProducts');
});

it('should show error message if orderables are empty', function() {
this.vm.association.orderables = [];
this.vm.addAssociation();

expect(this.alertService.error).toHaveBeenCalledWith('adminSupplyPartnerEdit.associationEmptyOrderables');
expect(this.alertService.error).toHaveBeenCalledWith('adminSupplyPartnerEdit.associationEmptyProducts');
});
});

Expand Down
2 changes: 1 addition & 1 deletion src/admin-supply-partner-edit/messages_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"adminSupplyPartnerEdit.associationEmptyProgram": "Program is required for new association.",
"adminSupplyPartnerEdit.associationEmptySupervisoryNode": "Supervisory Node is required for new association.",
"adminSupplyPartnerEdit.associationEmptyFacilities": "Facilities list cannot be empty for new association.",
"adminSupplyPartnerEdit.associationEmptyOrderables": "Ordereables list cannot be empty for new association.",
"adminSupplyPartnerEdit.associationEmptyProducts": "Product list cannot be empty for new association.",
"adminSupplyPartnerEdit.selectedFacilitiesAreFulfilledByThisSupplier": "Selected facilities are fulfilled by this supplier.",
"adminSupplyPartnerEdit.selectedProductsAreFulfilledByThisSupplier": "Selected products are fulfilled by this supplier."
}
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@
version "0.7.19"
resolved "https://codeload.github.com/HubSpot/offline/tar.gz/a17291864212aab9ae9325c7ce5a2e0f541e96bf"

"@bower_components/perfect-scrollbar@noraesae/perfect-scrollbar-bower#^0.8.1":
version "0.0.0"
resolved "https://codeload.github.com/noraesae/perfect-scrollbar-bower/tar.gz/b0a26373855b3d31ce5bd9904e2ba4d9a24ebf52"
"@bower_components/perfect-scrollbar@noraesae/perfect-scrollbar-bower#0.6.12":
version "0.5.9"
resolved "https://codeload.github.com/noraesae/perfect-scrollbar-bower/tar.gz/5f29dfcd6162b802a6a9407c4530d8797b59684d"

"@bower_components/pouchdb@pouchdb/pouchdb#^6.3.4":
version "6.4.3"
Expand Down