-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Catalog should not allow to pass multiple product descriptions with s…
…ame both language & type #152
- Loading branch information
1 parent
4ee78a2
commit f8e2937
Showing
6 changed files
with
174 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
199 changes: 85 additions & 114 deletions
199
VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,131 +1,102 @@ | ||
| angular.module('virtoCommerce.catalogModule') | ||
| .controller('virtoCommerce.catalogModule.editorialReviewDetailController', ['$scope', 'platformWebApp.bladeNavigationService', 'FileUploader', 'platformWebApp.settings', '$timeout', | ||
| function ($scope, bladeNavigationService, FileUploader, settings, $timeout) { | ||
| var blade = $scope.blade; | ||
|
|
||
| function initilize() { | ||
| if (!blade.item.reviews) { | ||
| blade.item.reviews = []; | ||
| }; | ||
| if (!blade.currentEntity) { | ||
| blade.currentEntity = {}; | ||
| }; | ||
| .controller('virtoCommerce.catalogModule.editorialReviewDetailController', ['$scope', 'platformWebApp.bladeNavigationService', 'FileUploader', 'platformWebApp.settings', '$timeout', | ||
| function ($scope, bladeNavigationService, FileUploader, settings, $timeout) { | ||
| var blade = $scope.blade; | ||
|
|
||
| function initilize() { | ||
| if (!blade.item.reviews) { | ||
| blade.item.reviews = []; | ||
| }; | ||
| if (!blade.currentEntity) { | ||
| blade.currentEntity = {}; | ||
| }; | ||
|
|
||
| blade.origEntity = blade.currentEntity; | ||
| blade.currentEntity = angular.copy(blade.currentEntity); | ||
| if (!blade.currentEntity.languageCode) { | ||
| blade.currentEntity.languageCode = blade.catalog.defaultLanguage.languageCode; | ||
| } | ||
|
|
||
| blade.origEntity = blade.currentEntity; | ||
| blade.currentEntity = angular.copy(blade.currentEntity); | ||
| if (!blade.currentEntity.languageCode) { | ||
| blade.currentEntity.languageCode = blade.catalog.defaultLanguage.languageCode; | ||
| $timeout(function () { | ||
| $scope.$broadcast('resetContent', { body: blade.currentEntity.content }); | ||
| blade.isLoading = false; | ||
| }); | ||
| } | ||
|
|
||
| $timeout(function () { | ||
| $scope.$broadcast('resetContent', { body: blade.currentEntity.content }); | ||
| blade.isLoading = false; | ||
| }); | ||
| } | ||
|
|
||
| $scope.isValid = true; | ||
|
|
||
| $scope.saveChanges = function () { | ||
| var existReview = _.find(blade.item.reviews, function (x) { return x == blade.origEntity; }); | ||
| if (!existReview) { | ||
| blade.item.reviews.push(blade.origEntity); | ||
| }; | ||
| angular.copy(blade.currentEntity, blade.origEntity); | ||
| $scope.bladeClose(); | ||
| }; | ||
|
|
||
| blade.headIcon = 'fa-comments'; | ||
| blade.title = 'catalog.blades.editorialReview-detail.title'; | ||
| blade.subtitle = 'catalog.blades.editorialReview-detail.subtitle'; | ||
| blade.editAsMarkdown = true; | ||
| blade.hasAssetCreatePermission = bladeNavigationService.checkPermission('platform:asset:create'); | ||
|
|
||
| if (blade.hasAssetCreatePermission) { | ||
| $scope.fileUploader = new FileUploader({ | ||
| url: 'api/platform/assets?folderUrl=catalog/' + blade.item.code, | ||
| headers: { Accept: 'application/json' }, | ||
| autoUpload: true, | ||
| removeAfterUpload: true, | ||
| onBeforeUploadItem: function (fileItem) { | ||
| blade.isLoading = true; | ||
| }, | ||
| onSuccessItem: function (fileItem, response) { | ||
| $scope.$broadcast('filesUploaded', { items: response }); | ||
| }, | ||
| onErrorItem: function (fileItem, response, status) { | ||
| bladeNavigationService.setError(fileItem._file.name + ' failed: ' + (response.message ? response.message : status), blade); | ||
| }, | ||
| onCompleteAll: function () { | ||
| blade.isLoading = false; | ||
| $scope.saveChanges = function () { | ||
|
|
||
| var isValid = $scope.isValid(); | ||
| if (isValid) { | ||
| if (!blade.currentEntity.id) | ||
| blade.item.reviews.push(blade.currentEntity); | ||
| else { | ||
| _.extend(_.findWhere(blade.item.reviews, { id: blade.currentEntity.id }), blade.currentEntity); | ||
| } | ||
| angular.copy(blade.currentEntity, blade.origEntity); | ||
| $scope.bladeClose(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| settings.getValues({ id: 'Catalog.EditorialReviewTypes' }, function (data) { | ||
| $scope.types = data; | ||
| if (!blade.currentEntity.reviewType) { | ||
| blade.currentEntity.reviewType = $scope.types[0]; | ||
| } | ||
| }); | ||
|
|
||
| $scope.openDictionarySettingManagement = function () { | ||
| var newBlade = new DictionarySettingDetailBlade('Catalog.EditorialReviewTypes'); | ||
| newBlade.parentRefresh = function (data) { | ||
| $scope.types = data; | ||
| }; | ||
| bladeNavigationService.showBlade(newBlade, blade); | ||
| }; | ||
| $scope.isValid = function () { | ||
| var result = formScope && formScope.$valid; | ||
|
|
||
| var formScope; | ||
| $scope.setForm = function (form) { formScope = form; } | ||
| //Check duplicates for new editorial reviews | ||
| result = !_.any(blade.item.reviews, function (x) { | ||
| return (x.id !== blade.currentEntity.id || (!x.id && !blade.currentEntity.id)) // 1st check is for edit mode, 2nd is for adding to prevent multiple same descs to be added | ||
| && x.reviewType === blade.currentEntity.reviewType && x.languageCode === blade.currentEntity.languageCode; | ||
| }); | ||
|
|
||
| blade.toolbarCommands = [ | ||
| { | ||
| name: "platform.commands.save", icon: 'fa fa-save', | ||
| executeMethod: saveChanges, | ||
| canExecuteMethod: canSave | ||
| }, | ||
| { | ||
| name: "platform.commands.reset", icon: 'fa fa-undo', | ||
| executeMethod: function () { | ||
| angular.copy(blade.origEntity, blade.currentEntity); | ||
| $scope.$broadcast('resetContent', { body: blade.currentEntity.content }); | ||
| }, | ||
| canExecuteMethod: isDirty | ||
| return result; | ||
| } | ||
| ]; | ||
|
|
||
| function saveChanges() { | ||
| var existReview = _.find(blade.item.reviews, function (x) { return x === blade.origEntity; }); | ||
| if (!existReview) { | ||
| blade.item.reviews.push(blade.origEntity); | ||
| }; | ||
|
|
||
| angular.copy(blade.currentEntity, blade.origEntity); | ||
| } | ||
|
|
||
| function isDirty() { | ||
| return !angular.equals(blade.currentEntity, blade.origEntity); | ||
| }; | ||
| blade.headIcon = 'fa-comments'; | ||
| blade.title = 'catalog.blades.editorialReview-detail.title'; | ||
| blade.subtitle = 'catalog.blades.editorialReview-detail.subtitle'; | ||
| blade.editAsMarkdown = true; | ||
| blade.hasAssetCreatePermission = bladeNavigationService.checkPermission('platform:asset:create'); | ||
|
|
||
| if (blade.hasAssetCreatePermission) { | ||
| $scope.fileUploader = new FileUploader({ | ||
| url: 'api/platform/assets?folderUrl=catalog/' + blade.item.code, | ||
| headers: { Accept: 'application/json' }, | ||
| autoUpload: true, | ||
| removeAfterUpload: true, | ||
| onBeforeUploadItem: function (fileItem) { | ||
| blade.isLoading = true; | ||
| }, | ||
| onSuccessItem: function (fileItem, response) { | ||
| $scope.$broadcast('filesUploaded', { items: response }); | ||
| }, | ||
| onErrorItem: function (fileItem, response, status) { | ||
| bladeNavigationService.setError(fileItem._file.name + ' failed: ' + (response.message ? response.message : status), blade); | ||
| }, | ||
| onCompleteAll: function () { | ||
| blade.isLoading = false; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function canSave() { | ||
| var thisBlade = blade; | ||
|
|
||
| var existing = blade.item.reviews.filter(function (x) { | ||
| return x.id && thisBlade.currentEntity && x.languageCode === thisBlade.currentEntity.languageCode && x.reviewType === thisBlade.currentEntity.reviewType; | ||
| settings.getValues({ id: 'Catalog.EditorialReviewTypes' }, function (data) { | ||
| $scope.types = data; | ||
| if (!blade.currentEntity.reviewType) { | ||
| blade.currentEntity.reviewType = $scope.types[0]; | ||
| } | ||
| }); | ||
|
|
||
| var justAdded = blade.item.reviews.filter(function (x) { return !x.id }); | ||
| var existingInJustAdded = justAdded.filter(function (x) { | ||
| return thisBlade.currentEntity && x.languageCode === thisBlade.currentEntity.languageCode && x.reviewType === thisBlade.currentEntity.reviewType; | ||
| }); | ||
| $scope.openDictionarySettingManagement = function () { | ||
| var newBlade = new DictionarySettingDetailBlade('Catalog.EditorialReviewTypes'); | ||
| newBlade.parentRefresh = function (data) { | ||
| $scope.types = data; | ||
| }; | ||
| bladeNavigationService.showBlade(newBlade, blade); | ||
| }; | ||
|
|
||
| return isDirty() && formScope && formScope.$valid && existing.length === 0 && existingInJustAdded.length === 0; | ||
| } | ||
| var formScope; | ||
| $scope.setForm = function (form) { formScope = form; } | ||
|
|
||
| blade.onClose = function (closeCallback) { | ||
| bladeNavigationService.showConfirmationIfNeeded(isDirty(), canSave(), blade, saveChanges, closeCallback, "catalog.dialogs.review-save.title", "catalog.dialogs.review-save.message"); | ||
| }; | ||
| function isDirty() { | ||
| return !angular.equals(blade.currentEntity, blade.origEntity); | ||
| }; | ||
|
|
||
| initilize(); | ||
| }]); | ||
| initilize(); | ||
| }]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.