Skip to content

Commit

Permalink
Merge pull request #923 from linea-it/develop
Browse files Browse the repository at this point in the history 
v0.15.2
  • Loading branch information
linea-relmanager authored Dec 1, 2017
2 parents 796f62f + eb61021 commit cbe9196
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 7 deletions.
2 changes: 1 addition & 1 deletion frontend/build/production/Sky/app.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/build/production/Sky/app.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.1.2.15","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"app.js"}],"css":[{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"remote":false,"exclude":["fashion"],"path":"resources/Sky-all_1.css"},{"remote":false,"exclude":["fashion"],"path":"resources/Sky-all_2.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Sky","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171130170439","cacheParam":"_dc"},"id":"495a5aab-e912-414c-bd2d-7b69ef5766b9","hash":"0dfbde2eeeaa6e7f5928877be3cf2c3e3dbca100","profile":"","resources":{"path":"resources"}}
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.1.2.15","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"app.js"}],"css":[{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"remote":false,"exclude":["fashion"],"path":"resources/Sky-all_1.css"},{"remote":false,"exclude":["fashion"],"path":"resources/Sky-all_2.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Sky","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171201134135","cacheParam":"_dc"},"id":"495a5aab-e912-414c-bd2d-7b69ef5766b9","hash":"c34277df716f5700aec150d98d3006dbde8060bb","profile":"","resources":{"path":"resources"}}
7 changes: 7 additions & 0 deletions frontend/sky/app/view/dataset/Compare.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ Ext.define('Sky.view.dataset.Compare', {
originalDataset: '{currentDataset}'
},


mapOptions: {
fullscreenControl: true,
zoom: 1,
enableLineaOverlay: false
},

initComponent: function () {
var me = this;

Expand Down
6 changes: 3 additions & 3 deletions frontend/sky/app/view/dataset/Dataset.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ Ext.define('Sky.view.dataset.Dataset', {
return false;
}

if (store.count() > 1) {
if (store.count() > 0) {
store.each(function (dataset) {
if (dataset.get('id') != currentDataset.get('id')) {
//if (dataset.get('id') != currentDataset.get('id')) {
item = {
xtype: 'menucheckitem',
text: dataset.get('release_display_name') + ' - ' + dataset.get('tag_display_name'),
Expand All @@ -285,7 +285,7 @@ Ext.define('Sky.view.dataset.Dataset', {
};

items.push(item);
}
//}
});

// Adicionar o botao magnetic
Expand Down
19 changes: 18 additions & 1 deletion frontend/sky/app/view/home/HomeController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@ Ext.define('Sky.view.home.HomeController', {

alias: 'controller.home',

listen: {
store: {
'#releases': {
load: 'onLoadReleases'
},
}
},

onLoadReleases: function (store) {
// console.log('onLoadReleases(%o)', store)
var me = this;
// Se so houver um release redireciona direto para o sky
if (store.count() == 1) {
me.onChooseRelease(store.first().get('id'));
}
},

onRowDblClick: function (grid, record) {
var me = this;

Expand All @@ -30,7 +47,7 @@ Ext.define('Sky.view.home.HomeController', {
var me = this,
txtSearch = me.getReferences().txtSearch,
store = me.getView().getStore();

if (txtSearch.getValue()){
txtSearch.setValue('');
}else{
Expand Down
3 changes: 2 additions & 1 deletion frontend/sky/app/view/home/HomeModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Ext.define('Sky.view.home.HomeModel', {

releases: {
type: 'releases',
remoteFilter: true
remoteFilter: true,
storeId: 'releases'
}
}

Expand Down

0 comments on commit cbe9196

Please sign in to comment.