Skip to content

Commit e2fa956

Browse files
committed
#514 - disable masterlist filter for keys
1 parent 4c73029 commit e2fa956

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Diff for: grails-app/assets/javascripts/profileEditor/controllers/OpusController.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,10 @@ profileEditor.controller('OpusController', function ($log, $scope, profileServic
611611
self.masterListKeybaseItemsLoaded = false;
612612
self.masterListKeybaseItems = null;
613613

614+
// Disable this feature to remove filter for keys https://github.com/AtlasOfLivingAustralia/profile-hub/issues/514
614615
self.canInitialiseKeyplayer = function() {
615-
if (self.masterListKeybaseItems !== null || self.masterListKeybaseItemsLoaded) return true;
616+
return true;
617+
/* if (self.masterListKeybaseItems !== null || self.masterListKeybaseItemsLoaded) return true;
616618
if (!self.opus) return false;
617619
if (!self.masterListKeybaseItemsLoading) {
618620
self.masterListKeybaseItemsLoading = true;
@@ -630,7 +632,7 @@ profileEditor.controller('OpusController', function ($log, $scope, profileServic
630632
messageService.alertStayOn(msg);
631633
});
632634
}
633-
return false;
635+
return false; */
634636
};
635637

636638
// Support for lazy loading the keyplayer.

Diff for: grails-app/assets/javascripts/profileEditor/controllers/ProfileController.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,10 @@ profileEditor.controller('ProfileController',
638638
self.masterListKeybaseItemsLoaded = false;
639639
self.masterListKeybaseItems = null;
640640

641+
// Disable this feature to remove filter for keys https://github.com/AtlasOfLivingAustralia/profile-hub/issues/514
641642
self.canInitialiseKeyplayer = function() {
642-
if (self.masterListKeybaseItems !== null || self.masterListKeybaseItemsLoaded) return true;
643+
return true;
644+
/* if (self.masterListKeybaseItems !== null || self.masterListKeybaseItemsLoaded) return true;
643645
if (!self.opus) return false;
644646
// if (!self.opus.masterListUid) return true;
645647
if (!self.masterListKeybaseItemsLoading) {
@@ -658,7 +660,7 @@ profileEditor.controller('ProfileController',
658660
messageService.alertStayOn(msg);
659661
});
660662
}
661-
return false;
663+
return false; */
662664
};
663665
self.initialiseKeyplayer = function() {
664666
self.keybaseTemplateUrl = 'keyplayer.html';

Diff for: grails-app/assets/javascripts/profileEditor/directives/keyplayer.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ profileEditor.directive('keyPlayer', function ($browser) {
4444
resultDisplay: resultDisplay
4545
};
4646

47-
if (self.onlyIncludeItems) {
47+
// Disable this feature to remove filter for keys https://github.com/AtlasOfLivingAustralia/profile-hub/issues/514
48+
/* if (self.onlyIncludeItems) {
4849
settings.filterItemNames = self.onlyIncludeItems.names;
4950
settings.filterItemGuids = self.onlyIncludeItems.guids;
5051
}
51-
52+
*/
5253
var action;
5354
var initialised = false;
5455
if (self.format == 'bracketed') {

0 commit comments

Comments
 (0)