gCubeSystem
/
rmp-common-library
15
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

updated queries for showing SmartGears and SmarGearsBundle version and some updated label names 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/rmp-common-library@114081 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2015-04-15 16:06:58 +00:00
parent 01db133d00
commit ebadf681ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GHN.xq
View File

@ -1,6 +1,6 @@
for $profiles in collection('/db/Profiles/GHN')//Resource for $profiles in collection('/db/Profiles/GHN')//Resource
let $gcf-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'gCF-version']/Value/text() let $gcf-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'gCF-version']/Value/text() | $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'SmartGears']/Value/text()
let $ghn-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'GHN-distribution-version']/Value/text() let $ghn-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'GHN-distribution-version']/Value/text() | $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'SmartGearsDistributionBundle']/Value/text()
let $scopes := string-join( $profiles/Scopes//Scope/text(), ';') let $scopes := string-join( $profiles/Scopes//Scope/text(), ';')
let $subtype := $profiles//Resource/Profile/Site/Domain/text() let $subtype := $profiles//Resource/Profile/Site/Domain/text()
<RES_SUBTYPE ISdefault =''/> <RES_SUBTYPE ISdefault =''/>

6
src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java
View File

@ -89,11 +89,11 @@ public class ResourceDetailModel {
modelColumns.add(status); modelColumns.add(status);
modelColumns.add(new ColumnConfig("LastUpdate", "Last Updated", 130)); modelColumns.add(new ColumnConfig("LastUpdate", "Last Updated", 130));
modelColumns.add(new ColumnConfig("gCoreVersion", "gCore v.", 50)); modelColumns.add(new ColumnConfig("gCoreVersion", "Version", 50));
modelColumns.add(new ColumnConfig("ghnVersion", "ghn v.", 40)); modelColumns.add(new ColumnConfig("ghnVersion", "Distro v.", 50));
ColumnConfig ramLeft = new ColumnConfig("VirtualAvailable", "V. Mem left", 70); ColumnConfig ramLeft = new ColumnConfig("VirtualAvailable", "Mem avail.", 70);
ramLeft.setAlignment(HorizontalAlignment.RIGHT); ramLeft.setAlignment(HorizontalAlignment.RIGHT);
ramLeft.setEditor(new CellEditor(new NumberField())); ramLeft.setEditor(new CellEditor(new NumberField()));
final NumberFormat number = NumberFormat.getFormat("#,##0;(#,##0)"); final NumberFormat number = NumberFormat.getFormat("#,##0;(#,##0)");