mirror of https://gitlab.crans.org/bde/nk20
Add true note name if we use an alias
This commit is contained in:
parent
b6c3178052
commit
e0c650a039
|
@ -18,12 +18,6 @@ class NoteSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Note
|
model = Note
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
extra_kwargs = {
|
|
||||||
'url': {
|
|
||||||
'view_name': 'project-detail',
|
|
||||||
'lookup_field': 'pk'
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class NoteClubSerializer(serializers.ModelSerializer):
|
class NoteClubSerializer(serializers.ModelSerializer):
|
||||||
|
@ -31,33 +25,45 @@ class NoteClubSerializer(serializers.ModelSerializer):
|
||||||
REST API Serializer for Club's notes.
|
REST API Serializer for Club's notes.
|
||||||
The djangorestframework plugin will analyse the model `NoteClub` and parse all fields in the API.
|
The djangorestframework plugin will analyse the model `NoteClub` and parse all fields in the API.
|
||||||
"""
|
"""
|
||||||
|
name = serializers.SerializerMethodField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = NoteClub
|
model = NoteClub
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
def get_name(self, obj):
|
||||||
|
return str(obj)
|
||||||
|
|
||||||
|
|
||||||
class NoteSpecialSerializer(serializers.ModelSerializer):
|
class NoteSpecialSerializer(serializers.ModelSerializer):
|
||||||
"""
|
"""
|
||||||
REST API Serializer for special notes.
|
REST API Serializer for special notes.
|
||||||
The djangorestframework plugin will analyse the model `NoteSpecial` and parse all fields in the API.
|
The djangorestframework plugin will analyse the model `NoteSpecial` and parse all fields in the API.
|
||||||
"""
|
"""
|
||||||
|
name = serializers.SerializerMethodField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = NoteSpecial
|
model = NoteSpecial
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
def get_name(self, obj):
|
||||||
|
return str(obj)
|
||||||
|
|
||||||
|
|
||||||
class NoteUserSerializer(serializers.ModelSerializer):
|
class NoteUserSerializer(serializers.ModelSerializer):
|
||||||
"""
|
"""
|
||||||
REST API Serializer for User's notes.
|
REST API Serializer for User's notes.
|
||||||
The djangorestframework plugin will analyse the model `NoteUser` and parse all fields in the API.
|
The djangorestframework plugin will analyse the model `NoteUser` and parse all fields in the API.
|
||||||
"""
|
"""
|
||||||
|
name = serializers.SerializerMethodField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = NoteUser
|
model = NoteUser
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
def get_name(self, obj):
|
||||||
|
return str(obj)
|
||||||
|
|
||||||
|
|
||||||
class AliasSerializer(serializers.ModelSerializer):
|
class AliasSerializer(serializers.ModelSerializer):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -86,7 +86,7 @@ class NotePolymorphicViewSet(viewsets.ModelViewSet):
|
||||||
else:
|
else:
|
||||||
queryset = queryset.none()
|
queryset = queryset.none()
|
||||||
|
|
||||||
return queryset
|
return queryset.distinct()
|
||||||
|
|
||||||
|
|
||||||
class AliasViewSet(viewsets.ModelViewSet):
|
class AliasViewSet(viewsets.ModelViewSet):
|
||||||
|
|
|
@ -187,7 +187,10 @@
|
||||||
notes += note;
|
notes += note;
|
||||||
let alias_obj = $("#alias_" + alias.normalized_name);
|
let alias_obj = $("#alias_" + alias.normalized_name);
|
||||||
alias_obj.hover(function() {
|
alias_obj.hover(function() {
|
||||||
$("#user_note").text(alias.name + " : " + pretty_money(note.balance));
|
var name = alias.name;
|
||||||
|
if (name !== note.name)
|
||||||
|
name += " (aka. " + note.name + ")";
|
||||||
|
$("#user_note").text(name + " : " + pretty_money(note.balance));
|
||||||
if (note.display_image == null)
|
if (note.display_image == null)
|
||||||
$("#profile_pic").attr('src', '/media/pic/default.png');
|
$("#profile_pic").attr('src', '/media/pic/default.png');
|
||||||
else
|
else
|
||||||
|
@ -257,8 +260,8 @@
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
aliases_matched_obj.html(aliases_matched_html);
|
|
||||||
});
|
});
|
||||||
|
aliases_matched_obj.html(aliases_matched_html);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -283,6 +286,8 @@
|
||||||
consos = [];
|
consos = [];
|
||||||
$("#note_list").html("");
|
$("#note_list").html("");
|
||||||
$("#alias_matched").html("");
|
$("#alias_matched").html("");
|
||||||
|
$("#profile_pic").attr("src", "/media/pic/default.png");
|
||||||
|
$("#user_note").text("");
|
||||||
refreshHistory();
|
refreshHistory();
|
||||||
refreshBalance();
|
refreshBalance();
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue