Compare commits
	
		
			1 Commits
		
	
	
		
			26cc3425ee
			...
			fe1c216c29
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fe1c216c29 | 
@@ -14,7 +14,7 @@ class Routine:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def updateCalendar(self, user):
 | 
					    def updateCalendar(self, user):
 | 
				
			||||||
            # check google:
 | 
					            # check google:
 | 
				
			||||||
            credentials =  user.getGoogleCredentials()
 | 
					            credentials = user.google_token
 | 
				
			||||||
            if credentials is None:
 | 
					            if credentials is None:
 | 
				
			||||||
               return 
 | 
					               return 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -23,6 +23,8 @@ class Routine:
 | 
				
			|||||||
            for calendar in calendars:
 | 
					            for calendar in calendars:
 | 
				
			||||||
                if calendar.toggle == 'True': 
 | 
					                if calendar.toggle == 'True': 
 | 
				
			||||||
                    visualCals.append(calendar.calendar_id)
 | 
					                    visualCals.append(calendar.calendar_id)
 | 
				
			||||||
 | 
					            client_token = GC.build_credentials(user.google_token.token,
 | 
				
			||||||
 | 
					                                                user.google_token.refresh_token)
 | 
				
			||||||
            googleCreds = google.oauth2.credentials.Credentials(**credentials)
 | 
					            googleCreds = google.oauth2.credentials.Credentials(**credentials)
 | 
				
			||||||
            calendarjson = caltojson.generateJsonFromCalendarEntries(visualCals,  googleCreds)
 | 
					            calendarjson = caltojson.generateJsonFromCalendarEntries(visualCals,  googleCreds)
 | 
				
			||||||
            user.setJson(calendarjson) 
 | 
					            user.setJson(calendarjson) 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user