Pending invitations shown on channel home page by jayoshih · Pull Request #258 · learningequality/studio

jayoshih · 2017-05-03T17:36:20Z

…into pending

…tion into pending

…ation into pending

Sign in to view

 return HttpResponse("Tags are successfully saved.", status=200)
+
+
+def add_editor_to_channel(invitation):


Sign in to view

 from rest_framework.authtoken.models import Token
 from le_utils.constants import content_kinds,file_formats, format_presets, licenses, exercises

+EDIT_ACCESS = "edit"


Sign in to view

 fields = ('email', 'first_name', 'last_name', 'id')

 class InvitationSerializer(BulkSerializerMixin, serializers.ModelSerializer):
+ channel_name = serializers.SerializerMethodField('retrieve_channel_name')


…into pending

…ation into pending

Sign in to view

 get_full_name: function(){
 return this.get('first_name') + " " + this.get('last_name');
+ },
+ get_channels: function(){


Sign in to view

 resend_invitation_email:function(channel){
 return mail_helper.send_mail(channel, this.get("email"), this.get("share_mode"));
+ },
+ accept_invitation:function(){


Sign in to view

+	}
+});
+
+var ChannelList = BaseViews.BaseEditableListView.extend({


…ation into pending

DXCanas

I've got some questions/concerns with some of the JS! Looks good for the most part, though.

Sign in to view

 if(this.image_error){
- var self = this;
- dialog.dialog("Image Error", this.image_error, { "OK":function(){} }, null);
+ dialog.alert("Image Error", this.image_error, null);


Sign in to view

+ },
+ get_pending_invites: function(){
+ var self = this;
+ return new Promise(function(resolve, reject){


Sign in to view

+ },
+ accept_invitation:function(){
+ var self = this;
+ return new Promise(function(resolve, reject){


Sign in to view

+	decline: function(){
+ var self = this;
+ dialog.dialog("Declining Invitation", "Are you sure you want to decline this invitation?", {
+ "CANCEL":function(){},


Sign in to view


+function alert(title, message, callback){
+ dialog(title, message, {
+ "OK":function(){}


Sign in to view

+ });
 }
 });



rtibbles · 2017-05-08T22:11:55Z

If the usage of Promises is pervasive, may be worth adding a shim for them.

DXCanas · 2017-05-09T01:28:49Z

RE: Promises #274

…ation into pending # Conflicts: # contentcuration/contentcuration/static/js/edit_channel/models.js # contentcuration/contentcuration/views.py

jayoshih added 8 commits May 1, 2017 19:00

Added separate classes for channels and invitations
d964d53

Added template for pending invites
7029033

Styled pending templates
a0839d6

Merge branch 'master' ofhttps://github.com/jayoshih/content-curation…
e99ecb8
…into pending

Added message templates for invitation responses
23d1d8c

Updated loading text
5b7c088

Added check for handling accepted invitations
2a5a807

Implemented accepting/declining invitations
bd4fb29

jayoshih added the needs review label May 3, 2017

jayoshih added 2 commits May 3, 2017 10:39

Merge branch 'master' ofhttps://github.com/fle-internal/content-cura…
95b73ff
…tion into pending

Merge branch 'develop' ofhttps://github.com/fle-internal/content-cur…
3cedb2a
…ation into pending