yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-15 10:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imports refactoring changes from linkedin branch into master

Browse Source
This commit is contained in:
Seyi Adebajo 2016-11-22 12:20:01 -08:00
parent 37939864b2
commit 3d9e054b67
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
web/public/javascripts/routers/datasets.js
View File

@ -201,9 +201,7 @@ App.DatasetsRoute = Ember.Route.extend({
}); });
App.DatasetRoute = Ember.Route.extend({ App.DatasetRoute = Ember.Route.extend({
setupController: function(controller, params) { setupController(controller, params) {
var _this = this;
detailController = controller;
currentTab = 'Datasets'; currentTab = 'Datasets';
updateActiveTab(); updateActiveTab();
var id = 0; var id = 0;
@ -211,31 +209,28 @@ App.DatasetRoute = Ember.Route.extend({
var urn = ''; var urn = '';
var name = ''; var name = '';
controller.set("hasProperty", false); controller.set("hasProperty", false);
if(params && params.id)
{
id = params.id;
source = params.source;
urn = params.urn;
name = params.name;
datasetController.set("detailview", true);
if (params.originalSchema)
{
Ember.set(params, 'schema', params.originalSchema);
}
controller.set('model', params);
if (params && params.id) {
({id, source, urn, name} = params);
let {originalSchema = null} = params;
datasetController.set('detailview', true);
if (originalSchema) {
Ember.set(params, 'schema', originalSchema);
} }
else {
if (params.dataset) controller.set('model', params);
{ } else if (params.dataset) {
id = params.dataset.id; ({id, source, urn, name} = params.dataset);
source = params.dataset.source;
urn = params.dataset.urn; controller.set('model', params.dataset);
name = params.dataset.name; datasetController.set('detailview', true);
controller.set('model', params.dataset); }
datasetController.set("detailview", true);
} // Don't set default zero Ids on controller
} if (id) {
controller.set('datasetId', id);
}
var instanceUrl = 'api/v1/datasets/' + id + "/instances"; var instanceUrl = 'api/v1/datasets/' + id + "/instances";
$.get(instanceUrl, function(data) { $.get(instanceUrl, function(data) {
@ -513,7 +508,6 @@ App.DatasetRoute = Ember.Route.extend({
}); });
var datasetPartitionsUrl = 'api/v1/datasets/' + id + "/access"; var datasetPartitionsUrl = 'api/v1/datasets/' + id + "/access";
var datasetAccessibilities = [];
$.get(datasetPartitionsUrl, function(data) { $.get(datasetPartitionsUrl, function(data) {
if (data && data.status == "ok") if (data && data.status == "ok")
{ {
@ -603,8 +597,9 @@ App.DatasetRoute = Ember.Route.extend({
} }
}); });
}, },
model: function(params) {
return Ember.$.getJSON('api/v1/datasets/' + params.id); model: function ({id}) {
return Ember.$.getJSON(`api/v1/datasets/${id}`);
}, },
actions: { actions: {
getSchema: function(){ getSchema: function(){