resolving some merge conflict that was just sitting here

hatnote · Oct 2, 2016 · 295ae3b · 295ae3b
1 parent fb3690c
commit 295ae3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/_run_dao_test.py b/_run_dao_test.py
@@ -59,13 +59,14 @@ def main():
     org_dao = OrganizerDAO(rdb_session, org_user)
 
     # should automatically add the creator as coordinator
-    campaign = org_dao.create_campaign(name='Test Campaign 2016',
+    campaign = org_dao.create_campaign(name='Basic test campaign',
                                        open_date=datetime.datetime(2015, 9, 10),
                                        close_date=datetime.datetime(2015, 10, 1))
 
-    yarl_user = org_dao.add_coordinator(campaign, username='Yarl')
+    mahm_user = org_dao.add_coordinator(campaign, username='MahmoudHashemi')
     slap_user = org_dao.add_coordinator(campaign, 'Slaporte')
-
+    leila_user = org_dao.add_coordinator(campaign, 'LilyOfTheWest')
+    import pdb;pdb.set_trace()
     coord_dao = CoordinatorDAO(rdb_session, yarl_user)
 
     juror_usernames = ['Slaporte', 'MahmoudHashemi', 'Yarl', 'Erwmat']

diff --git a/montage/rdb.py b/montage/rdb.py
@@ -49,9 +49,9 @@
                         'show_filename': True,
                         'show_resolution': True,
                         'dq_by_upload_date': True,
-                        'dq_by_resolution': True,
-                        'dq_by_uploader': True,
-                        'dq_by_filetype': True,
+                        'dq_by_resolution': False,
+                        'dq_by_uploader': False,
+                        'dq_by_filetype': False,
                         'allowed_filetypes': DEFAULT_ALLOWED_FILETYPES,
                         'min_resolution': DEFAULT_MIN_RESOLUTION,
                         'dq_coords': True,