Fix some bugs and tests

src/wirecloud/commons/utils/template/parsers/xml.py

@@ -418,8 +418,8 @@ def _parse_widget_info(self):
         xhtml_element = self._xpath(CODE_XPATH, self._doc)[0]
         self._info['contents'] = {
             'src': text_type(xhtml_element.get('src')),
-            'contenttype': xhtml_element.get('contenttype', 'text/html'),
-            'charset': xhtml_element.get('charset', 'utf-8'),
+            'contenttype': text_type(xhtml_element.get('contenttype', 'text/html')),
+            'charset': text_type(xhtml_element.get('charset', 'utf-8')),
             'useplatformstyle': xhtml_element.get('useplatformstyle', 'false').lower() == 'true',
             'cacheable': xhtml_element.get('cacheable', 'true').lower() == 'true'
         }
@@ -566,7 +566,6 @@ def _parse_workspace_info(self):
                         'readonly': prop.get('readonly', 'false').lower() == 'true',
                         'value': text_type(prop_value) if prop_value is not None else None,
                     }
-
                 for pref in self._xpath(PREFERENCE_VALUE_XPATH, widget):
                     pref_value = pref.get('value')
                     widget_info['preferences'][text_type(pref.get('name'))] = {

src/wirecloud/platform/iwidget/models.py

@@ -20,6 +20,7 @@
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext as _
+from six import text_type
 
 from wirecloud.commons.fields import JSONField
 from wirecloud.platform.wiring.utils import remove_widget_from_wiring_status
@@ -54,7 +55,11 @@ def set_variable_value(self, var_name, value, user):
             from wirecloud.platform.workspace.utils import encrypt_value
             value = encrypt_value(value)
         elif vardef['type'] == 'boolean':
-            value = bool(value)
+            if isinstance(value, text_type):
+                value = value.strip().lower() == "true"
+            else:
+                value = bool(value)
+
         elif vardef['type'] == 'number':
             value = float(value)
 

src/wirecloud/platform/tests/test-data/wiringstatus_v1.0.json

@@ -19,7 +19,8 @@
                     "hidden": false,
                     "value": false
                 }
-            }
+            },
+            "properties": {}
         }
     },
     "connections": [

src/wirecloud/platform/tests/test-data/wiringstatus_v2.0.json

@@ -47,6 +47,7 @@
                     "value": false
                 }
             },
+            "properties": {},
             "name": "Wirecloud/TestOperator/1.0"
         }
     },

src/wirecloud/platform/tests/test-data/wiringstatus_v2.0_no_views.json

@@ -47,6 +47,7 @@
                     "value": false
                 }
             },
+            "properties": {},
             "name": "Wirecloud/TestOperator/1.0"
         }
     },

src/wirecloud/platform/wiring/tests.py

@@ -2663,9 +2663,9 @@ def _reupload_and_use_operator(self, reload=False):
         prefix = 'test_'
         workspace = Workspace.objects.get(id=2)
         workspace.wiringStatus['operators']['0']['preferences'] = {
-            'prefix': {"readonly": False, "hidden": False, "value": {"users": {"2": prefix}}},
-            'exception_on_event': {"readonly": False, "hidden": False, "value": {"users": {"2": 'true'}}},
-            'test_logging': {"readonly": False, "hidden": False, "value": {"users": {"2": 'true'}}}
+            'prefix': {"readonly": False, "hidden": False, "value": {"users": {"4": prefix}}},
+            'exception_on_event': {"readonly": False, "hidden": False, "value": {"users": {"4": 'true'}}},
+            'test_logging': {"readonly": False, "hidden": False, "value": {"users": {"4": 'true'}}}
         }
         workspace.save()
 
@@ -2944,7 +2944,6 @@ def test_components_with_endpoints_collapsed_cannot_order_endpoints(self):
             menu_dropdown.close()
 
     def check_input_endpoint_exceptions(self):
-
         self.login(username='user_with_workspaces', next='/user_with_workspaces/Workspace')
 
         iwidgets = self.widgets
@@ -2980,15 +2979,16 @@ def check_input_endpoint_exceptions(self):
             modal.accept()
 
     def test_input_endpoint_exceptions(self):
+        user = User.objects.get(pk=4)
 
         # Enable widget exceptions
         iwidget = IWidget.objects.get(pk=2)
-        iwidget.set_variable_value("boolean", 'true')
+        iwidget.set_variable_value("boolean", 'true', user)
         iwidget.save()
 
         # Enable operator exceptions
         workspace = Workspace.objects.get(id=2)
-        workspace.wiringStatus['operators']['0']['preferences']['exception_on_event'] = {"readonly": False, "hidden": False, "value": {"users": {"2": 'true'}}}
+        workspace.wiringStatus['operators']['0']['preferences']['exception_on_event'] = {"readonly": False, "hidden": False, "value": {"users": {"4": 'true'}}}
         workspace.save()
 
         # Check exceptions

src/wirecloud/platform/wiring/views.py

@@ -150,9 +150,9 @@ def checkWiring(self, request, new_wiring_status, old_wiring_status, can_update_
                 removed_preferences = set(old_operator['preferences'].keys()) - set(operator['preferences'].keys())
                 updated_preferences = set(operator['preferences'].keys()).intersection(old_operator['preferences'].keys())
 
-                added_properties = set(operator['properties'].keys()) - set(old_operator['properties'].keys())
-                removed_properties = set(old_operator['properties'].keys()) - set(operator['properties'].keys())
-                updated_properties = set(operator['properties'].keys()).intersection(old_operator['properties'].keys())
+                added_properties = set(operator.get('properties', {}).keys()) - set(old_operator['properties'].keys())
+                removed_properties = set(old_operator['properties'].keys()) - set(operator.get('properties', {}).keys())
+                updated_properties = set(operator.get('properties', {}).keys()).intersection(old_operator['properties'].keys())
                 vendor, name, version = operator["name"].split("/")
                 try:
                     resource = CatalogueResource.objects.get(vendor=vendor, short_name=name, version=version).get_processed_info(process_variables=True)

src/wirecloud/platform/workspace/utils.py

@@ -484,14 +484,10 @@ def _get_global_workspace_data(workspaceDAO, user):
 
         try:
             resource = CatalogueResource.objects.get(vendor=vendor, short_name=name, version=version)
-            if not resource.is_available_for(workspaceDAO.creator):
-                # The operator used by this instance is missing
-                continue
+            operator_info = resource.get_processed_info(process_variables=True)
         except CatalogueResource.DoesNotExist:
             continue
 
-        operator_info = resource.get_processed_info(process_variables=True)
-
         operator_forced_values = forced_values['ioperator'].get(operator_id, {})
         # Build operator preference data
         for preference_name, preference in six.iteritems(operator.get('preferences', {})):