[misc] More changes needed for upgrading to PhenoTips 1.4-SNAPSHOT

phenotips · Oct 15, 2018 · 34091ac · 34091ac
1 parent a96f9a8
commit 34091ac
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 155 deletions.
diff --git a/ui/src/main/resources/PhenoTips/AllDataGadget.xml b/ui/src/main/resources/PhenoTips/AllDataGadget.xml
@@ -155,7 +155,7 @@ $xwiki.ssx.use('XWiki.DateTimePicker')##
 #set ($config = $xwiki.getDocument('data.WebHome').getObject('PhenoTips.DBConfigurationClass'))
 #set ($patientClassName = 'PhenoTips.PatientClass')
 #if ($config)
-#set ($columns = ['external_id', 'doc.creator', 'doc.creationDate'])
+#set ($columns = ['external_id', 'owner', 'doc.creationDate'])
 #set ($columnsProperties = {})
 #foreach ($column in $columns)
   #if ($foreach.index &lt;= 1)
@@ -177,6 +177,7 @@ $xwiki.ssx.use('XWiki.DateTimePicker')##
   'rowCount'          : 25,
   'maxPages'          : 10,
   'selectedColumn'    : $config.getProperty('livetableSortColumn').value,
+  'topFilters'        : "&lt;input type='hidden' name='owner/class' value='PhenoTips.OwnerClass'/&gt;",
   'defaultOrder'      : 'asc',
   'resultPage'        : 'PhenoTips.LiveTableResults'
 })

diff --git a/ui/src/main/resources/PhenoTips/FamilyDataGadget.xml b/ui/src/main/resources/PhenoTips/FamilyDataGadget.xml
@@ -134,15 +134,20 @@
   #set ($config = $xwiki.getDocument('data.WebHome').getObject('PhenoTips.DBConfigurationClass'))
   #set ($familyClassName = 'PhenoTips.FamilyClass')
   #if ($config)
-    #set ($columns = ['external_id', 'doc.creator', 'doc.creationDate', '_actions'])
-    #set ($columnsProperties = {
-      '_actions' : {'actions': ['edit', 'delete']}
-    })
+    #set ($columns = ['doc.name', 'external_id', 'proband_id', 'doc.creationDate'])
+    #set ($columnsProperties = {})
     #foreach ($column in $columns)
-      #set ($isFilterable = ($column == 'external_id'))
-      #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : 'view', 'size' : 7,
-        'filterable' : $isFilterable, 'sortable': true  }))
+      #if ($foreach.index &lt;= 1)
+        #set ($link = 'view')
+        #set ($isFilterable = true)
+      #else
+        #set ($link = 'field')
+        #set ($isFilterable = false)
+      #end
+      #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : $link, 'size' : 7, 'filterable' : $isFilterable, 'sortable': true  }))
     #end
+    #set ($discard = $columns.add('_actions'))
+    #set ($discard = $columnsProperties.put('_actions', {'actions': ['edit', 'delete']}))
   ##
   ##
     #set ($options = {
@@ -186,7 +191,8 @@
       <name>org.phenotips.homepage.dashboard.ownedFamilies</name>
     </property>
     <property>
-      <parameters>priority=70
+      <parameters>title={{translation key="phenotips.homepage.ownedFamilies.title"/}}#if($xwiki.hasAccessLevel('edit','Families.$reserved')) [[{{icon name="plus-circle"/}}{{translation key="phenotips.homepage.ownedFamilies.create"/}}&gt;&gt;Families.Create||class="extra"]]#end
+priority=70
 column=1
 enabled=false</parameters>
     </property>

diff --git a/ui/src/main/resources/PhenoTips/GroupsGadget.xml b/ui/src/main/resources/PhenoTips/GroupsGadget.xml
diff --git a/ui/src/main/resources/PhenoTips/PublicDataGadget.xml b/ui/src/main/resources/PhenoTips/PublicDataGadget.xml
@@ -135,14 +135,20 @@ $xwiki.ssx.use('XWiki.DateTimePicker')##
 #set ($config = $xwiki.getDocument('data.WebHome').getObject('PhenoTips.DBConfigurationClass'))
 #set ($patientClassName = 'PhenoTips.PatientClass')
 #if ($config)
-#set ($columns = ['external_id', 'doc.creator', 'doc.creationDate', '_actions'])
-#set ($columnsProperties = {
-  '_actions' : {'actions': ['edit', 'delete']}
-})
+#set ($columns = ['external_id', 'owner', 'doc.creationDate'])
+#set ($columnsProperties = {})
 #foreach ($column in $columns)
-  #set ($isFilterable = ($column == 'external_id'))
-  #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : 'view', 'size' : 7, 'filterable' : $isFilterable, 'sortable': true  }))
+  #if ($foreach.index &lt;= 1)
+     #set ($link = 'view')
+     #set ($isFilterable = true)
+  #else
+     #set ($link = 'field')
+     #set ($isFilterable = false)
+  #end
+  #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : $link, 'size' : 7, 'filterable' : $isFilterable, 'sortable': true }))
 #end
+#set ($discard = $columns.add('_actions'))
+#set ($discard = $columnsProperties.put('_actions', {'actions': ['edit', 'delete']}))
 ##
 ##
 #set ($options = {
@@ -177,7 +183,7 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', {'colorTheme' : "$xwiki.getSpace
       <name>org.phenotips.homepage.dashboard.publicData</name>
     </property>
     <property>
-      <parameters>title=Public Data  (% style="float: right;" %)[[Browse all data »&gt;&gt;data.AllData]]
+      <parameters>title=Public Data [[Browse all data »&gt;&gt;data.AllData||class="extra"]]
 column=2
 priority=50
 enabled=true</parameters>

diff --git a/ui/src/main/resources/PhenoTips/SharedFamilyGadget.xml b/ui/src/main/resources/PhenoTips/SharedFamilyGadget.xml
@@ -151,14 +151,20 @@ $xwiki.ssx.use('XWiki.DateTimePicker')##
 #set ($config = $xwiki.getDocument('data.WebHome').getObject('PhenoTips.DBConfigurationClass'))
 #set ($familyClassName = 'PhenoTips.FamilyClass')
 #if ($config)
-#set ($columns = ['external_id', 'doc.creator', 'doc.creationDate', '_actions'])
-#set ($columnsProperties = {
-  '_actions' : {'actions': ['edit', 'delete']}
-})
-#foreach ($column in $columns)
-  #set ($isFilterable = ($column == 'external_id'))
-  #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : 'view', 'size' : 7, 'filterable' : $isFilterable, 'sortable': true  }))
-#end
+  #set ($columns = ['doc.name', 'external_id', 'proband_id', 'owner', 'doc.creationDate'])
+  #set ($columnsProperties = {})
+  #foreach ($column in $columns)
+    #if ($foreach.index &lt;= 1)
+      #set ($link = 'view')
+      #set ($isFilterable = true)
+    #else
+      #set ($link = 'field')
+      #set ($isFilterable = false)
+    #end
+    #set ($discard = $columnsProperties.put($column, { 'type' : 'text', 'link' : $link, 'size' : 7, 'filterable' : $isFilterable, 'sortable': true  }))
+  #end
+  #set ($discard = $columns.add('_actions'))
+  #set ($discard = $columnsProperties.put('_actions', {'actions': ['edit', 'delete']}))
 ##
 ##
 #set ($options = {
@@ -167,6 +173,7 @@ $xwiki.ssx.use('XWiki.DateTimePicker')##
   'rowCount'          : 25,
   'maxPages'          : 10,
   'selectedColumn'    : $config.getProperty('livetableSortColumn').value,
+  'topFilters'        : "&lt;input type='hidden' name='owner/class' value='PhenoTips.OwnerClass'/&gt;",
   'defaultOrder'      : 'asc',
   'resultPage'        : 'PhenoTips.LiveTableResults'
 })
@@ -196,7 +203,8 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', {'colorTheme' : "$xwiki.getSpace
       <name>org.phenotips.homepage.dashboard.sharedFamilies</name>
     </property>
     <property>
-      <parameters>priority=80
+      <parameters>title={{translation key="phenotips.homepage.sharedFamilies.title"/}} [[{{translation key="phenotips.homepage.sharedFamilies.browse"/}}&gt;&gt;Families.WebHome||class="extra"]]
+priority=80
 column=1
 enabled=false</parameters>
     </property>

diff --git a/ui/src/main/resources/PhenoTips/UIX_Field__omim_suggestions.xml b/ui/src/main/resources/PhenoTips/UIX_Field__omim_suggestions.xml
@@ -116,7 +116,7 @@
 #end
 #set ($phenotypesSummary = [])
 #set ($hasSymptoms = 0)
-#__phenotypeSummary_create( $phenotypeSummary $hasSymptoms )
+#__phenotypeSummary_create( $phenotypesSummary $hasSymptoms )
 #if ($xcontext.action == 'edit' || $hasSymptoms)
   (% class="instant-search ncbi-search-box" %)(((
     === $services.localization.render('phenotips.UIXField.diagnosisSuggestions.omimSearch.matchingDisorders') ===