Merge pull request #41 from gtt-project/next

Updates main branch

Author: dkastl

app/controllers/subscription_templates_controller.rb

@@ -137,10 +137,10 @@ def prepare_payload
       method: "POST",
       json: {
         entity: "#{@entity_url}/${id}?type=${type}",
-        subject: @subscription_template.subject,
-        description: @subscription_template.description,
+        subject: @subscription_template.subject.chomp,
+        description: @subscription_template.description.chomp,
         attachments: @subscription_template.attachments,
-        notes: @subscription_template.notes,
+        notes: @subscription_template.notes.chomp,
         geometry: @subscription_template.geometry
       }
     }

app/views/subscription_templates/unpublish.js.erb

@@ -1,6 +1,14 @@
 // Build the request headers
 var headers = new Headers();
 
+<% if @subscription_template.fiware_service.present? %>
+  headers.append('Fiware-Service', '<%= @subscription_template.fiware_service %>');
+<% end %>
+
+<% if @subscription_template.fiware_servicepath.present? %>
+  headers.append('Fiware-ServicePath', '<%= @subscription_template.fiware_servicepath %>');
+<% end %>
+
 var authToken = document.getElementById('subscription_auth_token').value;
 if (authToken) {
   headers.append('Authorization', 'Bearer ' + authToken);