[Feature #12255] Pop-up Text improvement for the locked records
updated at 1-3-3 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/grsf-manage-widget@171457 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
450b37906e
commit
784882b390
|
@ -1,4 +1,8 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="org.gcube.portlets-widgets.grsf-manage-widget.1-3-3"
|
||||||
|
date="2018-09-14">
|
||||||
|
<Change>[Feature #12255] Pop-up Text improvement for the locked records</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-widgets.grsf-manage-widget.1-3-2"
|
<Changeset component="org.gcube.portlets-widgets.grsf-manage-widget.1-3-2"
|
||||||
date="2018-03-20">
|
date="2018-03-20">
|
||||||
<Change>[Task #11124] Testing the GRSF management panel</Change>
|
<Change>[Task #11124] Testing the GRSF management panel</Change>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
<artifactId>grsf-manage-widget</artifactId>
|
<artifactId>grsf-manage-widget</artifactId>
|
||||||
<version>1.3.2-SNAPSHOT</version>
|
<version>1.3.3-SNAPSHOT</version>
|
||||||
<name>gCube GRSF Manage widget</name>
|
<name>gCube GRSF Manage widget</name>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class GRSFNotificationService extends RemoteServiceServlet implements GRS
|
||||||
String currentScope = Utils.getCurrentContext(getThreadLocalRequest(), true);
|
String currentScope = Utils.getCurrentContext(getThreadLocalRequest(), true);
|
||||||
DataCatalogue instance = null;
|
DataCatalogue instance = null;
|
||||||
try{
|
try{
|
||||||
String scopeInWhichDiscover = (discoverScope != null && !discoverScope.isEmpty()) ? discoverScope : currentScope;
|
String scopeInWhichDiscover = discoverScope != null && !discoverScope.isEmpty() ? discoverScope : currentScope;
|
||||||
logger.debug("Discovering ckan utils library into scope " + scopeInWhichDiscover);
|
logger.debug("Discovering ckan utils library into scope " + scopeInWhichDiscover);
|
||||||
instance = DataCatalogueFactory.getFactory().getUtilsPerScope(scopeInWhichDiscover);
|
instance = DataCatalogueFactory.getFactory().getUtilsPerScope(scopeInWhichDiscover);
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
|
@ -221,7 +221,7 @@ public class GRSFNotificationService extends RemoteServiceServlet implements GRS
|
||||||
Status status = Status.fromString(extrasWithoutNamespaces.get(Constants.STATUS_OF_THE_GRSF_RECORD_CUSTOM_KEY).get(0));
|
Status status = Status.fromString(extrasWithoutNamespaces.get(Constants.STATUS_OF_THE_GRSF_RECORD_CUSTOM_KEY).get(0));
|
||||||
|
|
||||||
if(status.equals(Status.To_be_Merged) && !requestForRevertingMerge)
|
if(status.equals(Status.To_be_Merged) && !requestForRevertingMerge)
|
||||||
throw new Exception("Records under merging activities cannot be managed without explicit authorisation!");
|
throw new Exception("The record is locked due to a merge request in progress!");
|
||||||
|
|
||||||
String uuidKB = extrasWithoutNamespaces.get(Constants.UUID_KB_CUSTOM_KEY).get(0);
|
String uuidKB = extrasWithoutNamespaces.get(Constants.UUID_KB_CUSTOM_KEY).get(0);
|
||||||
String grsfDomain = extrasWithoutNamespaces.get(Constants.DOMAIN_CUSTOM_KEY).get(0);
|
String grsfDomain = extrasWithoutNamespaces.get(Constants.DOMAIN_CUSTOM_KEY).get(0);
|
||||||
|
@ -278,10 +278,10 @@ public class GRSFNotificationService extends RemoteServiceServlet implements GRS
|
||||||
// get the connections the knowledge base suggests
|
// get the connections the knowledge base suggests
|
||||||
List<ConnectedBean> suggestedConnectionsByKnowledgeBase = new ArrayList<ConnectedBean>(0);
|
List<ConnectedBean> suggestedConnectionsByKnowledgeBase = new ArrayList<ConnectedBean>(0);
|
||||||
List<String> exploitedResourcesUrls = isStock ?
|
List<String> exploitedResourcesUrls = isStock ?
|
||||||
(extrasWithoutNamespaces.containsKey(Constants.EXPLOITING_FISHERY_CUSTOM_KEY) ?
|
extrasWithoutNamespaces.containsKey(Constants.EXPLOITING_FISHERY_CUSTOM_KEY) ?
|
||||||
extrasWithoutNamespaces.get(Constants.EXPLOITING_FISHERY_CUSTOM_KEY) : null):
|
extrasWithoutNamespaces.get(Constants.EXPLOITING_FISHERY_CUSTOM_KEY) : null:
|
||||||
(extrasWithoutNamespaces.containsKey(Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) ?
|
extrasWithoutNamespaces.containsKey(Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) ?
|
||||||
extrasWithoutNamespaces.get(Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) : null);
|
extrasWithoutNamespaces.get(Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) : null;
|
||||||
|
|
||||||
if(exploitedResourcesUrls != null && !exploitedResourcesUrls.isEmpty()){
|
if(exploitedResourcesUrls != null && !exploitedResourcesUrls.isEmpty()){
|
||||||
for (String exploited : exploitedResourcesUrls) {
|
for (String exploited : exploitedResourcesUrls) {
|
||||||
|
@ -400,7 +400,7 @@ public class GRSFNotificationService extends RemoteServiceServlet implements GRS
|
||||||
String uuid = UUID.randomUUID().toString();
|
String uuid = UUID.randomUUID().toString();
|
||||||
String adminInUrl = "costantino.perciante";
|
String adminInUrl = "costantino.perciante";
|
||||||
String adminInUrlFullName = "Costantino Perciante";
|
String adminInUrlFullName = "Costantino Perciante";
|
||||||
long timestamp = System.currentTimeMillis() - 1000 * ((long)(Math.random() * 10 * 60 * 60));
|
long timestamp = System.currentTimeMillis() - 1000 * (long)(Math.random() * 10 * 60 * 60);
|
||||||
return new RevertableOperationInfo(
|
return new RevertableOperationInfo(
|
||||||
baseUrl, fullName, usernameCurrent, uuid, adminInUrlFullName, adminInUrl, timestamp, RevertableOperations.MERGE);
|
baseUrl, fullName, usernameCurrent, uuid, adminInUrlFullName, adminInUrl, timestamp, RevertableOperations.MERGE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue