Skip to content

Commit ca8368a

Browse files
author
Ebuson
committed
fix batch add people to image
1 parent 5993e99 commit ca8368a

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,15 +375,15 @@
375375
</span>
376376
</button>
377377
<span ng-class="{'image-info--multiple': ctrl.selectedImages.size > 0}"
378-
editable-text="ctrl.peopleInSelectedImages"
378+
editable-text="ctrl.metadata.peopleInImage"
379379
ng-hide="peopleInImageEditForm.$visible"
380380
onbeforesave="ctrl.updateMetadataField('peopleInImage', $data)"
381381
e:form="peopleInImageEditForm"
382382
e:ng-class="{'image-info__editor--error': $error,
383383
'image-info__editor--saving': peopleInImageEditForm.$waiting,
384384
'text-input': true}">
385385

386-
<ui-list-editor-info-panel
386+
<ui-list-editor-info-panel
387387
images="ctrl.selectedImages"
388388
add-to-images="ctrl.addPersonToImages"
389389
remove-from-images="ctrl.removePersonFromImages"
@@ -595,6 +595,7 @@
595595
</dl>
596596
</div>
597597

598+
598599
<div class="image-info">
599600
<dl class="image-info__group">
600601
<dt class="flex-container">

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ module.controller('grImageMetadataCtrl', [
6060
inject$($scope, Rx.Observable.fromPromise(selectedUsageCategory(ctrl.usageRights)), ctrl, 'usageCategory');
6161
ctrl.rawMetadata = rawMetadata();
6262
ctrl.metadata = displayMetadata();
63-
ctrl.peopleInSelectedImages = selectedPeople();
6463
ctrl.extraInfo = extraInfo();
6564
if (ctrl.singleImage) {
6665
updateSingleImage();
@@ -97,7 +96,10 @@ module.controller('grImageMetadataCtrl', [
9796

9897
ctrl.updateMetadataField = function (field, value) {
9998
var imageArray = Array.from(ctrl.selectedImages);
100-
99+
if (field === 'peopleInImage') {
100+
ctrl.addPersonToImages(imageArray, value)
101+
return
102+
}
101103
return editsService.batchUpdateMetadataField(
102104
imageArray,
103105
field,
@@ -297,15 +299,6 @@ module.controller('grImageMetadataCtrl', [
297299
return imageList.getOccurrences(labels);
298300
}
299301

300-
function selectedPeople() {
301-
let peopleInSelectedImages = [];
302-
ctrl.selectedImages.map((image) => {
303-
const currentPeopleInImage = ctrl.peopleAccessor(image);
304-
peopleInSelectedImages = peopleInSelectedImages.concat(currentPeopleInImage);
305-
});
306-
return [... new Set(peopleInSelectedImages)];
307-
}
308-
309302
function selectedUsageRights() {
310303
return ctrl.selectedImages.map(image => {
311304
return {

0 commit comments

Comments
 (0)