Skip to content

Commit

Permalink
Merge pull request #1069 from linea-it/develop
Browse files Browse the repository at this point in the history 
v0.20.1
  • Loading branch information
linea-relmanager authored Feb 2, 2018
2 parents 36258bd + 101a569 commit 3794774
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
1 change: 1 addition & 0 deletions api/userquery/target_viewer.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logging

from product.models import Product
from product_register.ImportProcess import Import
from product.models import Table as ProductTable
from userquery.models import Table
Expand Down
2 changes: 1 addition & 1 deletion frontend/build/production/UserQuery/app.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/build/production/UserQuery/app.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"packages":{"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.0.180"},"codemirror":{"css":true,"included":true,"namespace":"codemirror","required":true,"requires":["ext","core","classic"],"version":"1.0.0"},"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"}},"js":[{"path":"packages/local/codemirror/src/codemirror/codemirror.min.js"},{"path":"packages/local/codemirror/src/codemirror/lang/sql.min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/codemirror/src/codemirror/codemirror.css"},{"exclude":["fashion"],"path":"resources/UserQuery-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"UserQuery","namespace":"UserQuery","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20180131144927","cacheParam":"_dc"},"id":"ec311b0b-1ca2-4f2f-b672-f7e9bf9f9023","hash":"2830ab97fc18e7b2c45cca18979fa71703e5c67b","profile":"","resources":{"path":"resources"}}
{"packages":{"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.0.180"},"codemirror":{"css":true,"included":true,"namespace":"codemirror","required":true,"requires":["ext","core","classic"],"version":"1.0.0"},"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"}},"js":[{"path":"packages/local/codemirror/src/codemirror/codemirror.min.js"},{"path":"packages/local/codemirror/src/codemirror/lang/sql.min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/codemirror/src/codemirror/codemirror.css"},{"exclude":["fashion"],"path":"resources/UserQuery-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"UserQuery","namespace":"UserQuery","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20180202102824","cacheParam":"_dc"},"id":"ec311b0b-1ca2-4f2f-b672-f7e9bf9f9023","hash":"a27b36ef58615e9107375d4049ed68b877012262","profile":"","resources":{"path":"resources"}}
2 changes: 1 addition & 1 deletion frontend/build/production/UserQuery/app.jsonp
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Ext.Microloader.setManifest({"packages":{"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.0.180"},"codemirror":{"css":true,"included":true,"namespace":"codemirror","required":true,"requires":["ext","core","classic"],"version":"1.0.0"},"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"}},"js":[{"path":"packages/local/codemirror/src/codemirror/codemirror.min.js"},{"path":"packages/local/codemirror/src/codemirror/lang/sql.min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/codemirror/src/codemirror/codemirror.css"},{"exclude":["fashion"],"path":"resources/UserQuery-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"UserQuery","namespace":"UserQuery","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20180131144927","cacheParam":"_dc"},"id":"ec311b0b-1ca2-4f2f-b672-f7e9bf9f9023","hash":"2830ab97fc18e7b2c45cca18979fa71703e5c67b","profile":"","resources":{"path":"resources"}});
Ext.Microloader.setManifest({"packages":{"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.0.180"},"codemirror":{"css":true,"included":true,"namespace":"codemirror","required":true,"requires":["ext","core","classic"],"version":"1.0.0"},"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"}},"js":[{"path":"packages/local/codemirror/src/codemirror/codemirror.min.js"},{"path":"packages/local/codemirror/src/codemirror/lang/sql.min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/codemirror/src/codemirror/codemirror.css"},{"exclude":["fashion"],"path":"resources/UserQuery-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"UserQuery","namespace":"UserQuery","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20180202102824","cacheParam":"_dc"},"id":"ec311b0b-1ca2-4f2f-b672-f7e9bf9f9023","hash":"a27b36ef58615e9107375d4049ed68b877012262","profile":"","resources":{"path":"resources"}});
27 changes: 15 additions & 12 deletions frontend/userquery/app/view/main/MainController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,10 @@ var main = Ext.define('UserQuery.view.main.MainController', {
// evento: ao clicar no botão start job
btnStartJob_onClick: function(button){
var me = this;
var refs = me.getReferences();
var dialog = new StartJobDialog({animateTarget : button.getEl()});
var formData = refs.frmQuery.getForm().getValues();
var formData = me.getFormData();
var release = me.getActiveRelease() || {};

formData.sql_sentence = refs.sql_sentence.getValue();

if (release.id === undefined){
return Ext.MessageBox.show({
msg: 'Select release',
Expand Down Expand Up @@ -252,12 +249,20 @@ var main = Ext.define('UserQuery.view.main.MainController', {
});
},

getFormData(){
var refs = this.getReferences();
var data = refs.frmQuery.getForm().getValues();

data.sql_sentence = refs.sql_sentence.getValue();

return data;
},

// evento: ao clicar no botão save
btnSave_onClick: function(button){
var me = this;
var refs = me.getReferences();
var query = me.getActiveQuery();
var data = refs.frmQuery.getForm().getValues();
var data = me.getFormData();

if (query && query.is_sample){
me.mnuSaveAs_onClick(button);
Expand Down Expand Up @@ -344,10 +349,9 @@ var main = Ext.define('UserQuery.view.main.MainController', {
var vm = this.getViewModel();
var release = this.getActiveRelease();
var query = this.getActiveQuery() || {};
var data = refs.frmQuery.getForm().getValues();
var data = this.getFormData();
var i;

data.sql_sentence = refs.sql_sentence.getValue();
query.changed = true;

if (query._oldValues){
Expand All @@ -367,8 +371,7 @@ var main = Ext.define('UserQuery.view.main.MainController', {

mnuSaveAs_onClick: function(button){
var me = this;
var refs = this.getReferences();
var dataForm = refs.frmQuery.getForm().getValues();
var dataForm = me.getFormData();
var dialog = new SaveAsDialog({animateTarget : button.getEl()});

dialog.open(function(data){
Expand Down Expand Up @@ -715,8 +718,8 @@ var main = Ext.define('UserQuery.view.main.MainController', {
alertOverwriteQuery: function(confirm, cancel){
var query = this.getActiveQuery() || {};

if (query.changed === true){
if (query._valuesChanges.name){
if (query.changed === true && query.exist){
if (query._valuesChanges && query._valuesChanges.name){
confirm(true);
} else if (query._valuesChanges.sql_sentence) {
Ext.MessageBox.show({
Expand Down

0 comments on commit 3794774

Please sign in to comment.