D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redirection after merge of conflicts

This commit is contained in:
Michele Artini 2021-01-18 11:53:32 +01:00
parent 81eba4249d
commit eb0a1a73c1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dnet-orgs-database-application/TODO.txt
View File

@ -12,10 +12,6 @@ insert into org_index_search(id, txt) select o.id, to_tsvector(o.id||' '||o.name
select o.name from organizations o left outer join tmp_fulltext f on (o.id = f.id) where f.fulltext @@ plainto_tsquery('pisa university');
# Togliere filtro se il browse contiene meno di 10 elemnti
# Aggiungere filtro nelle select per l'editing dei metadati (solo se la lista è lunga)
# Togliere merges e merged_in dalla select per le creare le relazioni nel form di editing dei metadati
# Nella risoluzione dei conflicts aggiungere i bottoni merge_all, all_different, merge_advanced
# Nella risoluzione dei conflicts a partire dai singoli record redirigere la pagina sul nuovo record invece che sul record di partenza
# Includere la url nell'idice fulltetxt
# Prepareare un metodo update fulltext index to be scheduled

2
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html
View File

@ -26,6 +26,6 @@
</div>
</div>
<resolve-conflicts-modal modal-id="resolveConflictsModal" orgs="candidateConflicts" selected-orgs="selectedConflicts"></resolve-conflicts-modal>
<resolve-conflicts-modal modal-id="resolveConflictsModal" orgs="candidateConflicts" selected-orgs="selectedConflicts" open-new-org="1"></resolve-conflicts-modal>
<select-org-modal modal-id="addConflictModal" selected-org="newConflict" filter-status="approved" on-select="addConflict()"></select-org-modal>

12
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
View File

@ -73,7 +73,6 @@ orgsModule.directive('selectOrgModal', function($http, $timeout) {
scope.onSelect();
}
}
}
}
});
@ -93,10 +92,11 @@ orgsModule.directive('advancedMenuItem', function($http, $location, $route) {
}
});
orgsModule.directive('resolveConflictsModal', function($http, $route) {
orgsModule.directive('resolveConflictsModal', function($http, $route, $window) {
return {
restrict: 'E',
scope: {
'openNewOrg' : '@',
'modalId' : '@',
'orgs' : '=',
'selectedOrgs' : '='
@ -124,7 +124,11 @@ orgsModule.directive('resolveConflictsModal', function($http, $route) {
if (ids.length > 0) {
call_http_post($http, 'api/organizations/conflicts/fix/similar', ids, function(res) {
$('#' + scope.modalId).modal('hide');
$('#' + scope.modalId).on('hidden.bs.modal', function (e) { $route.reload(); });
if (scope.openNewOrg == '1') {
$('#' + scope.modalId).on('hidden.bs.modal', function (e) { $window.location.assign('#!/edit/0/' + res.data[0]); });
} else {
$('#' + scope.modalId).on('hidden.bs.modal', function (e) { $route.reload(); });
}
});
}
}
@ -435,7 +439,7 @@ orgsModule.controller('typesCtrl', function ($scope, $http, $routeParams) {
call_http_get($http, 'api/organizations/browse/types', function(res) { $scope.entries = res.data; });
});
orgsModule.controller('byTypeCtrl', function ($scope, $http, $routeParams, $location) {
orgsModule.controller('byTypeCtrl', function ($scope, $http, $routeParams, $) {
$scope.fieldValue = $routeParams.type;