Skip to content

Commit 2c6ec9c

Browse files
committed
[server-1547] added hrefs to back button and aggregate button.
1 parent 722d9b3 commit 2c6ec9c

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

plugins/dbviewer/frontend/public/javascripts/countly.views.js

+1
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ window.DBViewerView = countlyView.extend({
564564
$('#aggregate-header').show();
565565
$('#dbviewer-header').hide();
566566
$('#generate_aggregate_report').text($.i18n.map["dbviewer.generate-aggregate-report"]);
567+
$('#back_to_dbviewer').attr('href', '#/manage/db/' + self.templateData.db + '/' + self.templateData.collection);
567568
$('#back_to_dbviewer').text($.i18n.map["dbviewer.back-to-dbviewer"]);
568569
$('#back_to_dbviewer').css('display', 'block');
569570
}

plugins/dbviewer/frontend/public/templates/dbviewer.html

+10-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3 id="{{value.name}}-db-selector">{{value.name}}</h3>
4747
</div>
4848
<ul class="dbviewer-collection-list-{{value.name}}">
4949
{{#eachOfArray value.list}}
50-
<li data-db="{{../value.name}}" data-collection="{{#withItem ../value.collections key=value}}{{this}}{{/withItem}}" class="collection-list-item searchable"><a class="dbviewer-link-in-collection-list" href=href="#/manage/db/{{../value.name}}/{{#withItem ../value.collections key=value}}{{this}}{{/withItem}}">{{value}}</a></li>
50+
<li data-db="{{../value.name}}" data-collection="{{#withItem ../value.collections key=value}}{{this}}{{/withItem}}" class="collection-list-item searchable"><a class="dbviewer-link-in-collection-list" href="#/manage/db/{{../value.name}}/{{#withItem ../value.collections key=value}}{{this}}{{/withItem}}">{{value}}</a></li>
5151
{{/eachOfArray}}
5252
</ul>
5353
</div>
@@ -56,17 +56,21 @@ <h3 id="{{value.name}}-db-selector">{{value.name}}</h3>
5656
</div>
5757
<div class="right-side">
5858
<!-- Collection Back Button -->
59-
<a class="dbviewer-go-back" href="javascript:void(0)"><div class="icon-button light dbviewer-back-button"><i class="fa fa-chevron-left"></i> <span>{{back}}</span></div></a>
60-
<a class="dbviewer-aggregate" href="javascript:void(0)"><div class="icon-button light dbviewer-aggregate-button"><i class="fa fa-bar-chart"></i> <span data-localize="dbviewer.aggregate"></span></div></a>
59+
{{#if document}}
60+
<a class="dbviewer-go-back" href="#/manage/db/{{db}}/{{collection}}"><div class="icon-button light dbviewer-back-button"><i class="fa fa-chevron-left"></i> <span>{{back}}</span></div></a>
61+
{{else}}
62+
<a class="dbviewer-go-back" href="#/manage/db"><div class="icon-button light dbviewer-back-button"><i class="fa fa-chevron-left"></i> <span>{{back}}</span></div></a>
63+
{{/if}}
64+
<a class="dbviewer-aggregate" href="#/manage/db/aggregate/{{db}}/{{collection}}"><div class="icon-button light dbviewer-aggregate-button"><i class="fa fa-bar-chart"></i> <span data-localize="dbviewer.aggregate"></span></div></a>
6165
<div class="dbviewer-gray-area dbviewer-area-pos">
6266
<div class="dbviewer-header-of-query-wrapper">
6367
<div class="dbviewer-gray dbviewer-left-side-1">
6468
<a id="dbviewer-go-back" href='javascript:void()'>/</a>
6569
{{#if db}}
6670
{{#if collection}}
67-
<a class="dbviewer-gray dbviewer-go-back" id="dbviewer-go-collectionlist" data-db="{{db}}" href='javascript:void(0)'><strong>{{db}}</strong></a>
71+
<a class="dbviewer-gray dbviewer-go-back" id="dbviewer-go-collectionlist" data-db="{{db}}" href='#/manage/db/{{db}}'><strong>{{db}}</strong></a>
6872
{{#if document}}
69-
<a class="dbviewer-gray" href='javascript:void(0)'>/ {{collection}}</a>
73+
<a class="dbviewer-gray" href='#/manage/db/{{db}}/{{collection}}'>/ {{collection}}</a>
7074
{{else}}
7175
/{{collection}}
7276
{{/if}}
@@ -233,7 +237,7 @@ <h3 id="{{value.name}}-db-selector">{{value.name}}</h3>
233237
<img class="dbviewer-box-svg" src="./dbviewer/images/dbviewer/{{value.name}}.svg">
234238
<h3 class="dbviewer-db-title" data-localize="dbviewer.{{value.name}}-database"></h3>
235239
<p class="dbviewer-db-description" data-localize="dbviewer.{{value.name}}-database-description"></p>
236-
</div>
240+
</div>
237241
</a>
238242
{{/eachOfArray}}
239243
{{/if}}

0 commit comments

Comments
 (0)