Merge branch 'clear_sample_tracking' into remove_gridhelper

galaxyproject · Dec 10, 2017 · c9783de · c9783de
2 parents 96b9b15 + 410646c
commit c9783de
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 359 deletions.
diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
@@ -371,9 +371,6 @@ def __init__(self, **kwargs):
         # Beta containers interface used by GIEs
         self.enable_beta_containers_interface = string_as_bool(kwargs.get('enable_beta_containers_interface', 'False'))
 
-        # Deprecated API for sample tracking
-        self.enable_legacy_sample_tracking_api = string_as_bool(kwargs.get('enable_legacy_sample_tracking_api', 'False'))
-
         # Certain modules such as the pause module will automatically cause
         # workflows to be scheduled in job handlers the way all workflows will
         # be someday - the following two properties can also be used to force this

diff --git a/lib/galaxy/webapps/reports/controllers/sample_tracking.py b/lib/galaxy/webapps/reports/controllers/sample_tracking.py
diff --git a/templates/webapps/reports/index.mako b/templates/webapps/reports/index.mako
@@ -117,17 +117,6 @@
                         <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='system', action='index' )}">Disk space maintenance</a></div>
                     </div>
                 </div>
-                <div class="toolSectionPad"></div>
-                <div class="toolSectionPad"></div>
-                <div class="toolSectionTitle">
-                    <span>Sample Tracking</span>
-                </div>
-                <div class="toolSectionBody">
-                    <div class="toolSectionBg">
-                        <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='sample_tracking', action='per_month_all' )}">Sequencing requests per month</a></div>
-                        <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='sample_tracking', action='per_user' )}">Sequencing requests per user</a></div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>

diff --git a/templates/webapps/reports/requests_per_month_all.mako b/templates/webapps/reports/requests_per_month_all.mako
diff --git a/templates/webapps/reports/requests_per_user.mako b/templates/webapps/reports/requests_per_user.mako
diff --git a/templates/webapps/reports/requests_user_per_month.mako b/templates/webapps/reports/requests_user_per_month.mako