Project

General

Profile

Revision 6e2a9ba9

ID6e2a9ba9cdc1e66925aaec9d19997e9982feb632
Parent 80d21b78
Child 87bf25dd

Added by Andreas Kohlbecker over 1 year ago

ref #7759 adding more subtreefilter url patterns and commenting redundant patterns

View differences:

modules/cdm_dataportal/cdm_api/cdm_api.module
1824 1824

  
1825 1825
  $classification_subtree_filter_patterns = &drupal_static('classification_subtree_filter_patterns', array(
1826 1826
    "#/classification/[0-9a-f\-]{36}/childNodes#",
1827
    "#/classification/[0-9a-f\-]{36}/childNodesAt/{rankUuid}#",
1827
    /* covered by above pattern:
1828
    "#/classification/[0-9a-f\-]{36}/childNodesAt/[0-9a-f\-]{36}#",
1829
    '#/classification/[0-9a-f\-]{36}/childNodesOf/[0-9a-f\-]{36}#',
1830
    */
1828 1831
    "#/portal/classification/[0-9a-f\-]{36}/childNodes#",
1832
    /* covered by above pattern:
1829 1833
    "#/portal/classification/[0-9a-f\-]{36}/childNodesAt/[0-9a-f\-]{36}#",
1834
    '#/portal/classification/[0-9a-f\-]{36}/childNodesOf/[0-9a-f\-]{36}#',
1835
    */
1830 1836
    "#/portal/taxon/search#",
1831 1837
    "#/portal/taxon/find#",
1838
    /* covered by above pattern:
1832 1839
    "#/portal/taxon/findByDescriptionElementFullText#",
1833 1840
    "#/portal/taxon/findByFullText#",
1834 1841
    "#/portal/taxon/findByEverythingFullText#",
1835 1842
    "#/portal/taxon/findByIdentifier#",
1836
    "#/portal/taxon/findByMarker#"
1843
    "#/portal/taxon/findByMarker#",
1844
    "#/portal/taxon/findByMarker#",
1845
    "#/portal/taxon/findByMarker#",
1846
    */
1847
    "#/portal/taxon/[0-9a-f\-]{36}#"
1848
    /* covered by above pattern:
1849
    "#/portal/taxon/[0-9a-f\-]{36}/taxonNodes#",
1850
    */
1837 1851
  ));
1838 1852

  
1839 1853
  $sub_tree_filter_uuid_value = variable_get(CDM_SUB_TREE_FILTER_UUID, FALSE);
modules/cdm_dataportal/theme/cdm_dataportal.common.theme
50 50
}
51 51

  
52 52
/**
53
 * @todo Please document this function.
54
 * @see http://drupal.org/node/1354
53
 * Checks if the taxon specified by the uuid is contained in the currently focused classification.
54
 *
55
 * @param $taxon_uuid
56
 * @return bool
55 57
 */
56 58
function taxon_in_current_classification($taxon_uuid) {
57 59
  $taxon_nodes = cdm_ws_get(CDM_WS_PORTAL_TAXON_TAXONNODES, $taxon_uuid);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)