Pending invitations shown on channel home page

contentcuration/contentcuration/api.py

@@ -173,3 +173,16 @@ def batch_add_tags(request):
     ThroughModel.objects.bulk_create(bulk_list)
 
     return HttpResponse("Tags are successfully saved.", status=200)
+
+
+def add_editor_to_channel(invitation):
+    if invitation.share_mode == models.VIEW_ACCESS:
+        if invitation.invited in invitation.channel.editors.all():
+            invitation.channel.editors.remove(invitation.invited)
+        invitation.channel.viewers.add(invitation.invited)
+    else:
+        if invitation.invited in invitation.channel.viewers.all():
+            invitation.channel.viewers.remove(invitation.invited)
+        invitation.channel.editors.add(invitation.invited)
+    invitation.channel.save()
+    invitation.delete()

contentcuration/contentcuration/models.py

@@ -22,6 +22,9 @@
 from rest_framework.authtoken.models import Token
 from le_utils.constants import content_kinds,file_formats, format_presets, licenses, exercises
 
+EDIT_ACCESS = "edit"
+VIEW_ACCESS = "view"
+
 DEFAULT_USER_PREFERENCES = json.dumps({
     'license': licenses.CC_BY,
     'language': None,
@@ -611,7 +614,7 @@ class Invitation(models.Model):
     """ Invitation to edit channel """
     id = UUIDField(primary_key=True, default=uuid.uuid4)
     invited = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True, related_name='sent_to')
-    share_mode = models.CharField(max_length=50, default='edit')
+    share_mode = models.CharField(max_length=50, default=EDIT_ACCESS)
     email = models.EmailField(max_length=100, null=True)
     sender = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, related_name='sent_by', null=True)
     channel = models.ForeignKey('Channel', on_delete=models.SET_NULL, null=True, related_name='pending_editors')

contentcuration/contentcuration/serializers.py

@@ -620,6 +620,12 @@ class Meta:
         fields = ('email', 'first_name', 'last_name', 'id')
 
 class InvitationSerializer(BulkSerializerMixin, serializers.ModelSerializer):
+    channel_name = serializers.SerializerMethodField('retrieve_channel_name')
+    sender = UserSerializer(read_only=True)
+
+    def retrieve_channel_name(self, invitation):
+        return invitation.channel.name
+
     class Meta:
         model = Invitation
-        fields = ('id', 'invited', 'email', 'sender', 'channel', 'first_name', 'last_name', 'share_mode')
+        fields = ('id', 'invited', 'email', 'sender', 'channel', 'first_name', 'last_name', 'share_mode', 'channel_name')

contentcuration/contentcuration/static/js/edit_channel/file_upload/views.js

@@ -593,9 +593,7 @@ var FormatSlot = BaseViews.BaseListNodeItemView.extend({
     },
     file_failed:function(file, error){
         var self = this;
-        dialog.dialog("Error Uploading File", error, {
-            "OK":function(){}
-        }, function(){
+        dialog.alert("Error Uploading File", error, function(){
             self.render();
             self.set_uploading(false);
             self.containing_list_view.update_metadata();
@@ -832,8 +830,7 @@ var ThumbnailUploadView = BaseViews.BaseView.extend({
     },
     image_completed:function(){
         if(this.image_error){
-            var self = this;
-            dialog.dialog("Image Error", this.image_error, { "OK":function(){} }, null);
+            dialog.alert("Image Error", this.image_error);
             if(this.onerror){ this.onerror(); }
         }else{
             if(this.onsuccess){ this.onsuccess(this.image, this.image_formatted_name, this.image_url); }
@@ -1008,7 +1005,7 @@ var ImageUploadView = BaseViews.BaseModalView.extend({
     },
     file_complete:function(){
         if(this.file_error){
-            dialog.dialog("Image Error", this.file_error, { "OK":function(){} }, null);
+            dialog.alert("Image Error", this.file_error);
         }
         this.render_dropzone();
     }