Changeset 720

Timestamp:

11/07/07 16:26:43 (1 year ago)

Author:

markku

Message:

Closes #489

Files:

• trunk/app/models/protected_data.rb (modified) (2 diffs)
• trunk/test/functional/data_permission_controller_test.rb (modified) (2 diffs)

trunk/app/models/protected_data.rb

@@ -76 +76 @@
-    return false if permissions.empty? and other_permissions.empty?
-
+    data_permissions = self.data_permissions.find(permissions.keys)
+    # Sort permissions so that users editing permissions are first
+    data_permissions.sort! { |a, b|
+      users_editing_permission(a) ? (users_editing_permission(b) ? 0 : -1) : (users_editing_permission(b) ? 1 : 0)
+    }
+
-    DataPermission.transaction do
-
-
+
-        original_attributes = permission.attributes
-value
+permissions[permission.id] or permissions[permission.id.to_s]
-        permission.destroy and next if permission.gives_no_permissions?
-        next if permission.attributes == original_attributes
@@ -490 +495 @@
-  end
-
+  # Method: users_editing_permission
+  # ================================
+  # Returns true if the given permission is user's editing permission
+  #
+  # Parameter:
+  # ----------
+  # permission - A <DataPermission> to check
+  #
+  def users_editing_permission(permission)
+    return (UserAccount.current_user.user_groups.include?(permission.user_group) and permission.group_edit)
+  end
-end

trunk/test/functional/data_permission_controller_test.rb

@@ -177 +177 @@
-         :datatype => authorized_to_edit.class.to_s,
-         :object => {'other_read' => '1', 'other_edit' => '1'},
-
+.id
-    assert_response :redirect
-    assert_redirected_to @ref_url
@@ -183 +183 @@
-    assert_nil assigns(:title)
-    assert_not_equal authorized_to_edit.attributes, assigns(:object).attributes
- = Form.find authorized_to_edit.i
+.reloa
-# FIXME: This fails even though the attribute hashes seem to be identical !!!
-#    assert_equal authorized_to_edit.attributes, assigns(:object).attributes