resolve conflicts

solgenomics · Oct 8, 2020 · fcc55f5 · fcc55f5
1 parent a35e3d3
commit fcc55f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/lib/Tea/Controller/Expression_viewer.pm b/lib/Tea/Controller/Expression_viewer.pm
@@ -953,11 +953,11 @@ sub get_expression :Path('/expression_viewer/output/') :Args(0) {
     }
   }
 
-  my $deg_tab = $c->config->{deg_tab}||0;
-
-  my $network_tab = $c->config->{network_tab}||0;
-
+  my $deg_tab = $c->config->{deg_tab} // 1;
+  my $heatmap_tab = $c->config->{heatmap_tab} // 1;
+  my $scatterplot_tab = $c->config->{scatterplot_tab} // 1;
   my $expr_imgs_tab = $c->config->{expr_imgs_tab} // 1;
+  my $network_tab = $c->config->{network_tab}||0;
 
   $corr_filter = $c->req->param("correlation_filter")||0.65;
 
@@ -1004,9 +1004,11 @@ sub get_expression :Path('/expression_viewer/output/') :Args(0) {
   $c->stash->{locus_ids} = \%locus_ids;
 
   $c->stash->{deg_tab} = $deg_tab;
-  $c->stash->{network_tab} = $network_tab;
+  $c->stash->{heatmap_tab} = $heatmap_tab;
+  $c->stash->{scatterplot_tab} = $scatterplot_tab;
   $c->stash->{expr_imgs_tab} = $expr_imgs_tab;
-
+  $c->stash->{network_tab} = $network_tab;
+
   $c->stash->{template} = '/Expression_viewer/output.mas';
 }
 

diff --git a/mason/Expression_viewer/output.mas b/mason/Expression_viewer/output.mas
@@ -36,10 +36,10 @@ $tissue_filter => ()
 $condition_filter => ()
 
 $deg_tab => ()
-
-$network_tab => ()
-
 $expr_imgs_tab => ()
+$heatmap_tab => ()
+$scatterplot_tab => ()
+$network_tab => ()
 
 </%args>
 
@@ -102,6 +102,7 @@ my $json = JSON::Any->new;
 <script type="text/javascript" src="/static/js/d3heatmap_libs/d3-network/d3.network.js" charset="utf-8"></script>
 <link  href="/static/js/d3heatmap_libs/d3heatmapcore-0.0.0/heatmapcore.css" rel="stylesheet" />
 
+
 <script>
 $(document).ready(function () {
 	var errors = <% $json->encode(\@errors) %>;
@@ -265,16 +266,15 @@ $(document).ready(function () {
           if ($expr_imgs_tab) {
             print "<li id=\"expr_imgs_tab\"><a data-toggle=\"tab\" href=\"#container_tissues\"><img src=\"/static/images/ico1.png\" height=\"24\" style=\"padding-bottom:5px;\"/> Expression images</a></li>";
           }
-        </%perl>
-        <li id="heatmap_tab"><a data-toggle="tab" href="#container_heatmap"><img src="/static/images/ico3.png" height="24"/> Heatmap</a></li>
-
-      	<li id="scatterplots_tab"><a data-toggle="tab" href="#container_scatterplots"><img src="/static/images/ico4.png" height="24"/> Scatterplots</a></li>
-        <%perl>
+          if ($heatmap_tab) {
+            print "<li id=\"heatmap_tab\"><a data-toggle=\"tab\" href=\"#container_heatmap\"><img src=\"/static/images/ico3.png\" height=\"24\"/> Heatmap</a></li>";
+          }
+          if ($scatterplot_tab) {
+            print "<li id=\"scatterplots_tab\"><a data-toggle=\"tab\" href=\"#container_scatterplots\"><img src=\"/static/images/ico4.png\" height=\"24\"/> Scatterplots</a></li>";
+          }
           if ($deg_tab) {
             print "<li id=\"deg_tab\"><a data-toggle=\"tab\" href=\"#container_deg\"><img src=\"/static/images/ico5.png\" height=\"24\"/> DEGs</a></li>";
           }
-        </%perl>
-        <%perl>
           if ($network_tab) {
             print "<li id=\"network_tab\"><a data-toggle=\"tab\" href=\"#container_network\"><img src=\"/static/images/ico6.png\" height=\"24\"/> Network</a></li>";
           }