Skip to content
This repository was archived by the owner on Aug 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions gsoc/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,7 @@ def has_change_permission(self, request, obj=None):


class EventAdmin(admin.ModelAdmin):
list_display = ('title', 'start_date', 'end_date', 'cal_link')

def cal_link(self, obj):
if obj.link:
return mark_safe('<a href="{}" target="_blank">Goto Event</a>'.format(obj.link))
else:
return None
list_display = ('title', 'start_date', 'end_date', 'calendar_link')

def has_add_permission(self, request, obj=None):
return False
Expand Down
11 changes: 11 additions & 0 deletions gsoc/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,17 @@ class Event(models.Model):
blank=True)
event_id = models.CharField(max_length=255, null=True, blank=True)

@property
def calendar_link(self):
if self.event_id:
with open(os.path.join(BASE_DIR, 'google_api_token.pickle'), 'rb') as token:
creds = pickle.load(token)
service = build('calendar', 'v3', credentials=creds)
event = service.events().get(calendarId=self.timeline.calendar_id,
eventId=self.event_id).execute()
return event.get('htmlLink', None)
return None

def add_to_calendar(self):
with open(os.path.join(BASE_DIR, 'google_api_token.pickle'), 'rb') as token:
creds = pickle.load(token)
Expand Down
1 change: 1 addition & 0 deletions suborg/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from . import views

urlpatterns = [
url('^$', views.home, name='home'),
url('^application/', include([
url('^$', views.application_list, name='application_list'),
url('^new/', views.register_suborg, name='register_suborg'),
Expand Down
4 changes: 4 additions & 0 deletions suborg/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ def is_suborg_admin(user):
return user.is_current_year_suborg_admin()


def home(request):
return redirect(reverse('suborg:register_suborg'))


@decorators.login_required
def application_list(request):
applications = SubOrgDetails.objects.filter(suborg_admin_email=request.user.email)
Expand Down