From 578136e4d71b97d26d5a640df92b6da18fa45a5b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 24 Sep 2015 00:35:17 +0200 Subject: [PATCH] Host de imagenes en parametro de configuracion --- debian/changelog | 2 +- web/forms/admin/photos/photos.js | 2 ++ web/forms/admin/photos/ui.xml | 2 +- web/js/htk/image-editor.js | 2 ++ web/js/htk/image-editor.xml | 2 +- web/pages/web/web.js | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e7dabb3..cb636a1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.215-deb8) stable; urgency=low +hedera-web (1.217-deb8) stable; urgency=low * Initial Release. diff --git a/web/forms/admin/photos/photos.js b/web/forms/admin/photos/photos.js index dca40fbf..b542d5f9 100755 --- a/web/forms/admin/photos/photos.js +++ b/web/forms/admin/photos/photos.js @@ -8,6 +8,8 @@ Vn.Photos = new Class this.$('schema').value = 'catalog'; this.$('photo-size').value = 10 /* MB */ * 1048576; this.$('photo-id').focus (); + this.$('form').action = + '//'+ Vn.Config['image_host'] +'/hedera-web/rest.php?action=image'; } ,onFormSubmit: function () diff --git a/web/forms/admin/photos/ui.xml b/web/forms/admin/photos/ui.xml index c0b67e9f..4f83c08e 100755 --- a/web/forms/admin/photos/ui.xml +++ b/web/forms/admin/photos/ui.xml @@ -6,9 +6,9 @@
diff --git a/web/js/htk/image-editor.js b/web/js/htk/image-editor.js index 9cf8269c..15e39739 100755 --- a/web/js/htk/image-editor.js +++ b/web/js/htk/image-editor.js @@ -7,6 +7,8 @@ Htk.ImageEditor = new Class { this.builderInit (Htk.ImageEditor.Xml); this.$('max-size').value = 10 /* MB */ * 1048576; + this.$('form').action = + '//'+ Vn.Config['image_host'] +'/hedera-web/rest.php?action=image'; } ,onNameChange: function () diff --git a/web/js/htk/image-editor.xml b/web/js/htk/image-editor.xml index 7691c4d6..c7508f97 100644 --- a/web/js/htk/image-editor.xml +++ b/web/js/htk/image-editor.xml @@ -2,8 +2,8 @@

UpdateImage

diff --git a/web/pages/web/web.js b/web/pages/web/web.js index 7da1209c..49d61005 100755 --- a/web/pages/web/web.js +++ b/web/pages/web/web.js @@ -62,7 +62,7 @@ Vn.Web = this.conn.on ('loading-changed', this.onConnLoading, this); // this.conn.open (null, null, null, this.connOpened.bind (this)); - var sql = 'SELECT default_form, image_dir FROM config;' + var sql = 'SELECT default_form, image_dir, image_host FROM config;' +'SELECT production_domain, test_domain FROM config;' +'SELECT name FROM customer_view;' +'CALL form_list ();';