fiveapples 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819272c422885597ec73f8dd633cad031e882f03e9c5ee3d009a48792d1ae6eb
-  data.tar.gz: 96e67d9c2cbe9538ca91f30565f8c15553357a7d9c4880c6eccb45454de45917
+  metadata.gz: 6f1c3db06ef8a53cd1ccc2ec2050058c996d0b682c61773361dde6fcd7deefa4
+  data.tar.gz: 119d9e787983a1ae7e5ad084e44f64f93b5e28ca535e19355910f1dfb4ef7ecf
 SHA512:
-  metadata.gz: bf920145c28718564c5c207cb98eb4800d651e691340f1e670b3e8f794ae062c66bba5db6027c28aa09292effbe949b0fcb2db9f0aca1b9b0476b2c4ef13f62d
-  data.tar.gz: b8db84aa3f9f1c83ab63d524be0ee57b10804d39d573a23c59e9efacdfd6e4c6b8444108bb69c056d7399117aa8ea118451331877cb349c1a47175d14f4fa590
+  metadata.gz: d0233f73df9cb2303d1239795aa83418d7e698436aed5971b81bc27fc58194e136009fa44cd200a1d076d5751cbe2f333eb102ba2f4f493d1a0db5512418d5fd
+  data.tar.gz: f7547e4d1f4bd33f9efde96c948bf3b59efe3512e06f7acba66abcdf6a126623e1f090f46d6d82b50b83df37ff0ffbb30eee124b0e541f74611f6f52e72be8ca

data/lib/model.rb

@@ -41,6 +41,10 @@ class ODataFiveApples < OData::ServerApp
     name  'FiveApplesService'
     namespace  'ODataFiveApples'
     path_prefix '/odata'
+    if Safrano::VERSION >= '0.4.3'
+      server_url "http://#{FiveA.host}:#{FiveA.port}"
+    end
+      
     enable_batch 
     publish_media_model Photo do 
       slug :name 

data/lib/ui5/controller/Breeder_Detail.controller.js

@@ -67,9 +67,10 @@ sap.ui.define(
                       success: _loadavsuccs, 
                       error: _loadaverr });
       },
-      handleUploadComplete: function() {
-        FileUpload.onComplete(this);
-        this.loadAvatar();
+      handleUploadComplete: function(oEvent) {
+        if (FileUpload.onComplete(this, oEvent)) {
+          this.loadAvatar();
+        };
       },
       handleUploadPress: function() {
         FileUpload.onPress(this) ;

data/lib/ui5/controller/Cultivar_Detail.controller.js

@@ -181,9 +181,10 @@ sap.ui.define(
         Breeder._handleValueHelpClose(this, evt);
       },
       
-      handleUploadComplete: function() {
-        FileUpload.onComplete(this);
-        this.loadImages();
+      handleUploadComplete: function(oEvent) {
+        if (FileUpload.onComplete(this, oEvent)) {
+          this.loadImages();
+        };
       },
       handleUploadPress: function() {
         FileUpload.onPress(this) ;

data/lib/ui5/controller/FileUpload.js

@@ -30,10 +30,19 @@ function(MessageToast, Base64) {
 
         oFileUploader.upload();
       },
-      onComplete: function(that){
-        MessageToast.show("File Uploaded");
-        var oModel = that.getView().getModel();
-        oModel.refresh();
+      onComplete: function(that, oEvent){
+        var oPars = oEvent.getParameters();
+        if ( (oPars.status == 204) || (oPars.status == 201) 
+                                   || (oPars.status == 200 ) ) {
+          MessageToast.show("File Uploaded");
+          var oModel = that.getView().getModel();
+          oModel.refresh();
+          return true;
+        } else{
+          MessageToast.show("File Upload failed ! ");
+          return false;
+        }
+        
       }
    };
   }

data/lib/ui5/controller/Parentage_Detail.controller.js

@@ -22,13 +22,11 @@ sap.ui.define(
       onDetailMatched: function(oEvent) {
         var oObject = oEvent.getParameter("arguments");
         var sObjectKey =
-          "cultivar_id='" +
+          "cultivar_id=" +
           oObject.cultivar_id +
-          "',ptype_id='" +
+          ",ptype_id=" +
           oObject.ptype_id +
-          "',parent_id='" +
-          oObject.parent_id +
-          "'";
+          ",parent_id=" +   oObject.parent_id ;
         var sObjectPath = "/parentage(" + sObjectKey + ")";
 
         this._sObjectPath = sObjectPath;

data/lib/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module FiveApples
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end
 
 module OpenUI5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiveapples
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
-- D.M.
+- oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safrano
@@ -8649,7 +8649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Fiveapples is a fully opensource standalone OData + openui5 demo app.