diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 725bf93e88..fea5242070 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -288,7 +288,7 @@ tabs: #- 6 # Basepath #- 7 # TM #- 8 # DS - #- 9 # System + - 9 # Type actions: Datastore.refresh: true Datastore.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index af975667da..df8169889f 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -289,7 +289,7 @@ tabs: #- 6 # Basepath #- 7 # TM #- 8 # DS - #- 9 # System + #- 9 # Type actions: Datastore.refresh: true Datastore.create_dialog: false diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index b7a8fac8bb..6156797b59 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -60,7 +60,7 @@ var datastores_tab_content = '\ '+tr("Basepath")+'\ '+tr("TM MAD")+'\ '+tr("DS MAD")+'\ - '+tr("System")+'\ + '+tr("Type")+'\ \ \ \ @@ -76,7 +76,13 @@ var create_datastore_tmpl = \
\
\ -
\ +
\ +
'+tr("Wizard")+'
\ +
'+tr("Advanced mode")+'
\ +
\ +
    \ +
  • \ +
    \
    \ \
    \ @@ -104,7 +110,7 @@ var create_datastore_tmpl =
    \
    \
    \ -
\ +
\
\
\ \ @@ -263,17 +269,35 @@ var create_datastore_tmpl =
\
\
\ -
\ \ + \ +
  • \ +
    \ + \ +
    \ +
    \ + \ +
    \ + \ + \ +
  • \ + \ ×\ - '; + '; var datastore_image_table_tmpl='\ \ @@ -569,6 +593,13 @@ function datastoreElements() { function datastoreElementArray(element_json){ var element = element_json.DATASTORE; + var type = "IMAGE_DS"; + + if (typeof element.TEMPLATE.TYPE != "undefined") + { + type = element.TEMPLATE.TYPE; + } + return [ '