Compare commits
	
		
			2 Commits
		
	
	
		
			d7a58053f5
			...
			2fa124f529
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2fa124f529 | |||
| 5ebba78346 | 
@@ -6,7 +6,7 @@ from .models import Schedule
 | 
				
			|||||||
@admin.register(Schedule)
 | 
					@admin.register(Schedule)
 | 
				
			||||||
class ScheduleAdmin(admin.ModelAdmin):
 | 
					class ScheduleAdmin(admin.ModelAdmin):
 | 
				
			||||||
    list_display    = ('name', 'employee', 'email', 'created_at', 'processed')
 | 
					    list_display    = ('name', 'employee', 'email', 'created_at', 'processed')
 | 
				
			||||||
    ordering        = ('name', 'created_at')
 | 
					    ordering        = ('created_at', 'name',)
 | 
				
			||||||
    search_fields   = ('name', 'email')
 | 
					    search_fields   = ('name', 'email')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def processed(self,obj):
 | 
					    def processed(self,obj):
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,8 +31,7 @@ def new_or_update_study(request, schedule = None):
 | 
				
			|||||||
            try:
 | 
					            try:
 | 
				
			||||||
                new_schedule.planning_source = json.loads(schedule_form.cleaned_data['json'])
 | 
					                new_schedule.planning_source = json.loads(schedule_form.cleaned_data['json'])
 | 
				
			||||||
            except json.JSONDecodeError as ex:
 | 
					            except json.JSONDecodeError as ex:
 | 
				
			||||||
                # For now, sorry, ignore
 | 
					                new_schedule.planning_source = json.loads(json.dumps({'error': str(ex)}))
 | 
				
			||||||
                pass
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            new_schedule.employee = request.user.employee
 | 
					            new_schedule.employee = request.user.employee
 | 
				
			||||||
            new_schedule.name = schedule_form.cleaned_data['name']
 | 
					            new_schedule.name = schedule_form.cleaned_data['name']
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user