renamed List to Note everywhere thru-out project in preparation for complete overhaul of applet capabilities
This commit is contained in:
@@ -10,12 +10,12 @@ from django.views.decorators.csrf import ensure_csrf_cookie
|
||||
|
||||
from apps.applets.models import Applet, UserApplet
|
||||
from apps.applets.utils import applet_context
|
||||
from apps.dashboard.forms import ExistingListItemForm, ItemForm
|
||||
from apps.dashboard.models import Item, List
|
||||
from apps.dashboard.forms import ExistingNoteItemForm, ItemForm
|
||||
from apps.dashboard.models import Item, Note
|
||||
from apps.lyric.models import PaymentMethod, Token, User, Wallet
|
||||
|
||||
|
||||
APPLET_ORDER = ["wallet", "new-list", "my-lists", "username", "palette"]
|
||||
APPLET_ORDER = ["wallet", "new-note", "my-notes", "username", "palette"]
|
||||
UNLOCKED_PALETTES = frozenset(["palette-default"])
|
||||
PALETTES = [
|
||||
{"name": "palette-default", "label": "Earthman", "locked": False},
|
||||
@@ -27,9 +27,9 @@ PALETTES = [
|
||||
]
|
||||
|
||||
|
||||
def _recent_lists(user, limit=3):
|
||||
def _recent_notes(user, limit=3):
|
||||
return (
|
||||
List
|
||||
Note
|
||||
.objects
|
||||
.filter(Q(owner=user) | Q(shared_with=user))
|
||||
.annotate(last_item=Max('item__id'))
|
||||
@@ -45,18 +45,18 @@ def home_page(request):
|
||||
}
|
||||
if request.user.is_authenticated:
|
||||
context["applets"] = applet_context(request.user, "dashboard")
|
||||
context["recent_lists"] = _recent_lists(request.user)
|
||||
context["recent_notes"] = _recent_notes(request.user)
|
||||
return render(request, "apps/dashboard/home.html", context)
|
||||
|
||||
def new_list(request):
|
||||
def new_note(request):
|
||||
form = ItemForm(data=request.POST)
|
||||
if form.is_valid():
|
||||
nulist = List.objects.create()
|
||||
nunote = Note.objects.create()
|
||||
if request.user.is_authenticated:
|
||||
nulist.owner = request.user
|
||||
nulist.save()
|
||||
form.save(for_list=nulist)
|
||||
return redirect(nulist)
|
||||
nunote.owner = request.user
|
||||
nunote.save()
|
||||
form.save(for_note=nunote)
|
||||
return redirect(nunote)
|
||||
else:
|
||||
context = {
|
||||
"form": form,
|
||||
@@ -65,46 +65,46 @@ def new_list(request):
|
||||
}
|
||||
if request.user.is_authenticated:
|
||||
context["applets"] = applet_context(request.user, "dashboard")
|
||||
context["recent_lists"] = _recent_lists(request.user)
|
||||
context["recent_notes"] = _recent_notes(request.user)
|
||||
return render(request, "apps/dashboard/home.html", context)
|
||||
|
||||
def view_list(request, list_id):
|
||||
our_list = List.objects.get(id=list_id)
|
||||
def view_note(request, note_id):
|
||||
our_note = Note.objects.get(id=note_id)
|
||||
|
||||
if our_list.owner:
|
||||
if our_note.owner:
|
||||
if not request.user.is_authenticated:
|
||||
return redirect("/")
|
||||
if request.user != our_list.owner and request.user not in our_list.shared_with.all():
|
||||
if request.user != our_note.owner and request.user not in our_note.shared_with.all():
|
||||
return HttpResponseForbidden()
|
||||
|
||||
form = ExistingListItemForm(for_list=our_list)
|
||||
form = ExistingNoteItemForm(for_note=our_note)
|
||||
|
||||
if request.method == "POST":
|
||||
form = ExistingListItemForm(for_list=our_list, data=request.POST)
|
||||
form = ExistingNoteItemForm(for_note=our_note, data=request.POST)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
return redirect(our_list)
|
||||
return render(request, "apps/dashboard/list.html", {"list": our_list, "form": form})
|
||||
|
||||
def my_lists(request, user_id):
|
||||
return redirect(our_note)
|
||||
return render(request, "apps/dashboard/note.html", {"note": our_note, "form": form})
|
||||
|
||||
def my_notes(request, user_id):
|
||||
owner = User.objects.get(id=user_id)
|
||||
if not request.user.is_authenticated:
|
||||
return redirect("/")
|
||||
if request.user.id != owner.id:
|
||||
return HttpResponseForbidden()
|
||||
return render(request, "apps/dashboard/my_lists.html", {"owner": owner})
|
||||
return render(request, "apps/dashboard/my_notes.html", {"owner": owner})
|
||||
|
||||
def share_list(request, list_id):
|
||||
our_list = List.objects.get(id=list_id)
|
||||
def share_note(request, note_id):
|
||||
our_note = Note.objects.get(id=note_id)
|
||||
try:
|
||||
recipient = User.objects.get(email=request.POST["recipient"])
|
||||
if recipient == request.user:
|
||||
return redirect(our_list)
|
||||
our_list.shared_with.add(recipient)
|
||||
return redirect(our_note)
|
||||
our_note.shared_with.add(recipient)
|
||||
except User.DoesNotExist:
|
||||
pass
|
||||
messages.success(request, "An invite has been sent if that address is registered.")
|
||||
return redirect(our_list)
|
||||
return redirect(our_note)
|
||||
|
||||
@login_required(login_url="/")
|
||||
def set_palette(request):
|
||||
@@ -137,7 +137,7 @@ def toggle_applets(request):
|
||||
"applets": applet_context(request.user, "dashboard"),
|
||||
"palettes": PALETTES,
|
||||
"form": ItemForm(),
|
||||
"recent_lists": _recent_lists(request.user),
|
||||
"recent_notes": _recent_notes(request.user),
|
||||
})
|
||||
return redirect("home")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user