changed share permission functions

amahi · Aug 11, 2018 · 2a6d1e5 · 2a6d1e5
1 parent e4b2c4b
commit 2a6d1e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/views/friendings/_share_permissions.slim b/app/views/friendings/_share_permissions.slim
@@ -1,3 +1,4 @@
+
 - shares = Share.all
 - local_user = User.find(friend_user['local_id']) rescue nil
 
@@ -24,7 +25,7 @@
                 = simple_remote_checkbox :id => "share_access_id_#{share['id']}",
                              :css_class => 'share_checkbox',
                              :url => toggle_readonly_share_path(:id => share['id']),
-                             :checked => share.users_with_write_access.include?(local_user)
+                             :checked => share.users_with_share_access.include?(local_user)
 
           td.align-middle
             = form_tag friendings_engine.toggle_share_access_path,\
@@ -38,4 +39,4 @@
                 = simple_remote_checkbox :id => "share_writable_id_#{share['id']}",
                              :css_class => 'share_checkbox',
                              :url => toggle_readonly_share_path(:id => share['id']),
-                             :checked => share.users_with_share_access.include?(local_user)
+                             :checked => share.users_with_write_access.include?(local_user)
diff --git a/lib/friendings/amahi_friending_api.rb b/lib/friendings/amahi_friending_api.rb
@@ -166,11 +166,14 @@ def self.delete_user(user_id, email, type)
 		end
 	end
 
-	def self.update_share_permission(share_id, user_id, type) #user_id is wrong, create user if local user not exist
+	def self.update_share_permission(share_id, user_id, type)
+		user = User.find(user_id)
+		share = Share.find(share_id)
+
 		if type == "access"
-			Share.find(share_id).toggle_access!(user_id)
+			share.toggle_access!(user.id)
 		else
-			Share.find(share_id).toggle_write!(user_id)
+			share.toggle_write!(user.id)
 		end
 	end