Merge pull request #270 from Mognom/multiuser

Fix patch over a variable destroying other variables
Wirecloud · Feb 28, 2017 · b77d935 · b77d935
2 parents c4a73d2 + 82be33d
commit b77d935
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/wirecloud/platform/tests/rest_api.py b/src/wirecloud/platform/tests/rest_api.py
@@ -1184,6 +1184,8 @@ def test_workspace_wiring_entry_patch_preference_value(self):
 
         # Check if preferences changed
         self.assertEqual(Workspace.objects.get(pk=202).wiringStatus["operators"]["2"]["preferences"]["pref_secure"]["value"]["users"]["4"], "helloWorld")
+        # Other preferences should not be modified
+        self.assertEqual(Workspace.objects.get(pk=202).wiringStatus["operators"]["2"]["preferences"]["username"]["value"]["users"]["4"], "test_username")
 
     def test_workspace_wiring_entry_patch_preference_value_read_only_permission(self):
         url = reverse('wirecloud.workspace_wiring', kwargs={'workspace_id': 202})

diff --git a/src/wirecloud/platform/wiring/views.py b/src/wirecloud/platform/wiring/views.py
@@ -188,6 +188,9 @@ def checkWiring(self, request, new_wiring_status, old_wiring_status, can_update_
             for preference_name in updated_preferences:
                 old_preference = old_operator['preferences'][preference_name]
                 new_preference = operator['preferences'][preference_name]
+                # Using patch means no change at all on non-modified preferences
+                if old_preference == new_preference:
+                    continue
 
                 # Check if its multiuser
                 if preference_name in operator_preferences: