diff options
Diffstat (limited to 'django/engagementmanager')
197 files changed, 30 insertions, 22 deletions
diff --git a/django/engagementmanager/__init__.py b/django/engagementmanager/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/__init__.py +++ b/django/engagementmanager/__init__.py diff --git a/django/engagementmanager/admin.py b/django/engagementmanager/admin.py index 38a63f8..38a63f8 100755..100644 --- a/django/engagementmanager/admin.py +++ b/django/engagementmanager/admin.py diff --git a/django/engagementmanager/apps.py b/django/engagementmanager/apps.py index e4a967d..e4a967d 100755..100644 --- a/django/engagementmanager/apps.py +++ b/django/engagementmanager/apps.py diff --git a/django/engagementmanager/bus/__init__.py b/django/engagementmanager/bus/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/bus/__init__.py +++ b/django/engagementmanager/bus/__init__.py diff --git a/django/engagementmanager/bus/handlers/__init__.py b/django/engagementmanager/bus/handlers/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/bus/handlers/__init__.py +++ b/django/engagementmanager/bus/handlers/__init__.py diff --git a/django/engagementmanager/bus/handlers/activity_event_handler.py b/django/engagementmanager/bus/handlers/activity_event_handler.py index d5ef819..d5ef819 100755..100644 --- a/django/engagementmanager/bus/handlers/activity_event_handler.py +++ b/django/engagementmanager/bus/handlers/activity_event_handler.py diff --git a/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py b/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py index 6ef4fdb..6ef4fdb 100755..100644 --- a/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py +++ b/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py diff --git a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py index 598b977..598b977 100755..100644 --- a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py +++ b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py diff --git a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py index 12acea1..12acea1 100755..100644 --- a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py +++ b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py diff --git a/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py b/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py index 9919cad..9919cad 100755..100644 --- a/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py +++ b/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py diff --git a/django/engagementmanager/bus/handlers/digest_email_notification_handler.py b/django/engagementmanager/bus/handlers/digest_email_notification_handler.py index 7f5cb6b..7f5cb6b 100755..100644 --- a/django/engagementmanager/bus/handlers/digest_email_notification_handler.py +++ b/django/engagementmanager/bus/handlers/digest_email_notification_handler.py diff --git a/django/engagementmanager/bus/handlers/new_notification_handler.py b/django/engagementmanager/bus/handlers/new_notification_handler.py index 00491fa..00491fa 100755..100644 --- a/django/engagementmanager/bus/handlers/new_notification_handler.py +++ b/django/engagementmanager/bus/handlers/new_notification_handler.py diff --git a/django/engagementmanager/bus/handlers/service_bus_base_handler.py b/django/engagementmanager/bus/handlers/service_bus_base_handler.py index 7b4a83b..7b4a83b 100755..100644 --- a/django/engagementmanager/bus/handlers/service_bus_base_handler.py +++ b/django/engagementmanager/bus/handlers/service_bus_base_handler.py diff --git a/django/engagementmanager/bus/messages/__init__.py b/django/engagementmanager/bus/messages/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/bus/messages/__init__.py +++ b/django/engagementmanager/bus/messages/__init__.py diff --git a/django/engagementmanager/bus/messages/activity_event_message.py b/django/engagementmanager/bus/messages/activity_event_message.py index 67bf319..67bf319 100755..100644 --- a/django/engagementmanager/bus/messages/activity_event_message.py +++ b/django/engagementmanager/bus/messages/activity_event_message.py diff --git a/django/engagementmanager/bus/messages/daily_scheduled_message.py b/django/engagementmanager/bus/messages/daily_scheduled_message.py index 41941e8..41941e8 100755..100644 --- a/django/engagementmanager/bus/messages/daily_scheduled_message.py +++ b/django/engagementmanager/bus/messages/daily_scheduled_message.py diff --git a/django/engagementmanager/bus/messages/hourly_scheduled_message.py b/django/engagementmanager/bus/messages/hourly_scheduled_message.py index 8c733bf..8c733bf 100755..100644 --- a/django/engagementmanager/bus/messages/hourly_scheduled_message.py +++ b/django/engagementmanager/bus/messages/hourly_scheduled_message.py diff --git a/django/engagementmanager/bus/messages/new_notification_message.py b/django/engagementmanager/bus/messages/new_notification_message.py index ce4ce06..ce4ce06 100755..100644 --- a/django/engagementmanager/bus/messages/new_notification_message.py +++ b/django/engagementmanager/bus/messages/new_notification_message.py diff --git a/django/engagementmanager/bus/messages/service_bus_base_message.py b/django/engagementmanager/bus/messages/service_bus_base_message.py index 3f97a0d..3f97a0d 100755..100644 --- a/django/engagementmanager/bus/messages/service_bus_base_message.py +++ b/django/engagementmanager/bus/messages/service_bus_base_message.py diff --git a/django/engagementmanager/cms_client/__init__.py b/django/engagementmanager/cms_client/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/cms_client/__init__.py +++ b/django/engagementmanager/cms_client/__init__.py diff --git a/django/engagementmanager/cms_client/api.py b/django/engagementmanager/cms_client/api.py index a0ca5b1..a0ca5b1 100755..100644 --- a/django/engagementmanager/cms_client/api.py +++ b/django/engagementmanager/cms_client/api.py diff --git a/django/engagementmanager/decorator/__init__.py b/django/engagementmanager/decorator/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/decorator/__init__.py +++ b/django/engagementmanager/decorator/__init__.py diff --git a/django/engagementmanager/decorator/auth.py b/django/engagementmanager/decorator/auth.py index 686a8cc..686a8cc 100755..100644 --- a/django/engagementmanager/decorator/auth.py +++ b/django/engagementmanager/decorator/auth.py diff --git a/django/engagementmanager/decorator/class_decorator.py b/django/engagementmanager/decorator/class_decorator.py index 362e473..362e473 100755..100644 --- a/django/engagementmanager/decorator/class_decorator.py +++ b/django/engagementmanager/decorator/class_decorator.py diff --git a/django/engagementmanager/decorator/log_func_entry.py b/django/engagementmanager/decorator/log_func_entry.py index 1e7d840..1e7d840 100755..100644 --- a/django/engagementmanager/decorator/log_func_entry.py +++ b/django/engagementmanager/decorator/log_func_entry.py diff --git a/django/engagementmanager/decorator/retry.py b/django/engagementmanager/decorator/retry.py index d0c15c1..d0c15c1 100755..100644 --- a/django/engagementmanager/decorator/retry.py +++ b/django/engagementmanager/decorator/retry.py diff --git a/django/engagementmanager/git/__init__.py b/django/engagementmanager/git/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/git/__init__.py +++ b/django/engagementmanager/git/__init__.py diff --git a/django/engagementmanager/git/git_manager.py b/django/engagementmanager/git/git_manager.py index 4bc8de0..4bc8de0 100755..100644 --- a/django/engagementmanager/git/git_manager.py +++ b/django/engagementmanager/git/git_manager.py diff --git a/django/engagementmanager/http_client.py b/django/engagementmanager/http_client.py index c4c8afd..c4c8afd 100755..100644 --- a/django/engagementmanager/http_client.py +++ b/django/engagementmanager/http_client.py diff --git a/django/engagementmanager/mail.py b/django/engagementmanager/mail.py index 10279b9..10279b9 100755..100644 --- a/django/engagementmanager/mail.py +++ b/django/engagementmanager/mail.py diff --git a/django/engagementmanager/management/__init__.py b/django/engagementmanager/management/__init__.py index 36beacd..36beacd 100755..100644 --- a/django/engagementmanager/management/__init__.py +++ b/django/engagementmanager/management/__init__.py diff --git a/django/engagementmanager/management/commands/__init__.py b/django/engagementmanager/management/commands/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/management/commands/__init__.py +++ b/django/engagementmanager/management/commands/__init__.py diff --git a/django/engagementmanager/management/commands/clean_gitlab_content.py b/django/engagementmanager/management/commands/clean_gitlab_content.py index 5299367..5299367 100755..100644 --- a/django/engagementmanager/management/commands/clean_gitlab_content.py +++ b/django/engagementmanager/management/commands/clean_gitlab_content.py diff --git a/django/engagementmanager/management/commands/clean_jenkins_jobs.py b/django/engagementmanager/management/commands/clean_jenkins_jobs.py index c19f28d..c19f28d 100755..100644 --- a/django/engagementmanager/management/commands/clean_jenkins_jobs.py +++ b/django/engagementmanager/management/commands/clean_jenkins_jobs.py diff --git a/django/engagementmanager/management/commands/clean_vvp_db.py b/django/engagementmanager/management/commands/clean_vvp_db.py index 931f684..931f684 100755..100644 --- a/django/engagementmanager/management/commands/clean_vvp_db.py +++ b/django/engagementmanager/management/commands/clean_vvp_db.py diff --git a/django/engagementmanager/management/commands/clean_vvp_system.py b/django/engagementmanager/management/commands/clean_vvp_system.py index a86f770..a86f770 100755..100644 --- a/django/engagementmanager/management/commands/clean_vvp_system.py +++ b/django/engagementmanager/management/commands/clean_vvp_system.py diff --git a/django/engagementmanager/management/commands/initial_populate_db.py b/django/engagementmanager/management/commands/initial_populate_db.py index a0ca177..a0ca177 100755..100644 --- a/django/engagementmanager/management/commands/initial_populate_db.py +++ b/django/engagementmanager/management/commands/initial_populate_db.py diff --git a/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py b/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py index 2d6c5be..2d6c5be 100755..100644 --- a/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py +++ b/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py diff --git a/django/engagementmanager/management/commands/render_rgwa_credentials.py b/django/engagementmanager/management/commands/render_rgwa_credentials.py index 52a1373..52a1373 100755..100644 --- a/django/engagementmanager/management/commands/render_rgwa_credentials.py +++ b/django/engagementmanager/management/commands/render_rgwa_credentials.py diff --git a/django/engagementmanager/migrations/0001_initial.py b/django/engagementmanager/migrations/0001_initial.py index ffbb95a..ffbb95a 100755..100644 --- a/django/engagementmanager/migrations/0001_initial.py +++ b/django/engagementmanager/migrations/0001_initial.py diff --git a/django/engagementmanager/migrations/0001_squashed_initial.py b/django/engagementmanager/migrations/0001_squashed_initial.py index 1be6a07..ae740e2 100755..100644 --- a/django/engagementmanager/migrations/0001_squashed_initial.py +++ b/django/engagementmanager/migrations/0001_squashed_initial.py @@ -54,7 +54,8 @@ logger = LoggingServiceFactory.get_logger() def forwards(apps, schema_editor): - if not schema_editor.connection.alias == 'default': + if not schema_editor.connection.alias == 'default' \ + or settings.DATABASES["default"]["ENGINE"] == "django.db.backends.sqlite3": return cursor = connection.cursor() diff --git a/django/engagementmanager/migrations/0002_auto_20160704_1028.py b/django/engagementmanager/migrations/0002_auto_20160704_1028.py index 682394a..682394a 100755..100644 --- a/django/engagementmanager/migrations/0002_auto_20160704_1028.py +++ b/django/engagementmanager/migrations/0002_auto_20160704_1028.py diff --git a/django/engagementmanager/migrations/0003_auto_20160713_0929.py b/django/engagementmanager/migrations/0003_auto_20160713_0929.py index 3bc94a0..3bc94a0 100755..100644 --- a/django/engagementmanager/migrations/0003_auto_20160713_0929.py +++ b/django/engagementmanager/migrations/0003_auto_20160713_0929.py diff --git a/django/engagementmanager/migrations/0004_auto_20160720_2143.py b/django/engagementmanager/migrations/0004_auto_20160720_2143.py index cfc04d3..cfc04d3 100755..100644 --- a/django/engagementmanager/migrations/0004_auto_20160720_2143.py +++ b/django/engagementmanager/migrations/0004_auto_20160720_2143.py diff --git a/django/engagementmanager/migrations/0005_auto_20160815_1248.py b/django/engagementmanager/migrations/0005_auto_20160815_1248.py index decbe51..decbe51 100755..100644 --- a/django/engagementmanager/migrations/0005_auto_20160815_1248.py +++ b/django/engagementmanager/migrations/0005_auto_20160815_1248.py diff --git a/django/engagementmanager/migrations/0006_auto_20160825_0644.py b/django/engagementmanager/migrations/0006_auto_20160825_0644.py index 285631d..285631d 100755..100644 --- a/django/engagementmanager/migrations/0006_auto_20160825_0644.py +++ b/django/engagementmanager/migrations/0006_auto_20160825_0644.py diff --git a/django/engagementmanager/migrations/0007_auto_20160922_0421.py b/django/engagementmanager/migrations/0007_auto_20160922_0421.py index 655f30d..655f30d 100755..100644 --- a/django/engagementmanager/migrations/0007_auto_20160922_0421.py +++ b/django/engagementmanager/migrations/0007_auto_20160922_0421.py diff --git a/django/engagementmanager/migrations/0008_auto_20161009_1210.py b/django/engagementmanager/migrations/0008_auto_20161009_1210.py index ce6ddcc..ce6ddcc 100755..100644 --- a/django/engagementmanager/migrations/0008_auto_20161009_1210.py +++ b/django/engagementmanager/migrations/0008_auto_20161009_1210.py diff --git a/django/engagementmanager/migrations/0009_auto_20161018_0740.py b/django/engagementmanager/migrations/0009_auto_20161018_0740.py index 5536536..5536536 100755..100644 --- a/django/engagementmanager/migrations/0009_auto_20161018_0740.py +++ b/django/engagementmanager/migrations/0009_auto_20161018_0740.py diff --git a/django/engagementmanager/migrations/0010_auto_20161025_0838.py b/django/engagementmanager/migrations/0010_auto_20161025_0838.py index 19f8db6..19f8db6 100755..100644 --- a/django/engagementmanager/migrations/0010_auto_20161025_0838.py +++ b/django/engagementmanager/migrations/0010_auto_20161025_0838.py diff --git a/django/engagementmanager/migrations/0011_auto_20161109_0811.py b/django/engagementmanager/migrations/0011_auto_20161109_0811.py index 9bcf50c..9bcf50c 100755..100644 --- a/django/engagementmanager/migrations/0011_auto_20161109_0811.py +++ b/django/engagementmanager/migrations/0011_auto_20161109_0811.py diff --git a/django/engagementmanager/migrations/0012_auto_20161109_0822.py b/django/engagementmanager/migrations/0012_auto_20161109_0822.py index 79214dc..79214dc 100755..100644 --- a/django/engagementmanager/migrations/0012_auto_20161109_0822.py +++ b/django/engagementmanager/migrations/0012_auto_20161109_0822.py diff --git a/django/engagementmanager/migrations/0013_auto_20161128_1159.py b/django/engagementmanager/migrations/0013_auto_20161128_1159.py index 06a55c1..06a55c1 100755..100644 --- a/django/engagementmanager/migrations/0013_auto_20161128_1159.py +++ b/django/engagementmanager/migrations/0013_auto_20161128_1159.py diff --git a/django/engagementmanager/migrations/0014_auto_20161129_1145.py b/django/engagementmanager/migrations/0014_auto_20161129_1145.py index ee4efd4..ee4efd4 100755..100644 --- a/django/engagementmanager/migrations/0014_auto_20161129_1145.py +++ b/django/engagementmanager/migrations/0014_auto_20161129_1145.py diff --git a/django/engagementmanager/migrations/0015_engagementstatus.py b/django/engagementmanager/migrations/0015_engagementstatus.py index 84eee4d..84eee4d 100755..100644 --- a/django/engagementmanager/migrations/0015_engagementstatus.py +++ b/django/engagementmanager/migrations/0015_engagementstatus.py diff --git a/django/engagementmanager/migrations/0016_auto_20161208_0842.py b/django/engagementmanager/migrations/0016_auto_20161208_0842.py index 92d1518..92d1518 100755..100644 --- a/django/engagementmanager/migrations/0016_auto_20161208_0842.py +++ b/django/engagementmanager/migrations/0016_auto_20161208_0842.py diff --git a/django/engagementmanager/migrations/0017_auto_20161215_1535.py b/django/engagementmanager/migrations/0017_auto_20161215_1535.py index c0adc38..c0adc38 100755..100644 --- a/django/engagementmanager/migrations/0017_auto_20161215_1535.py +++ b/django/engagementmanager/migrations/0017_auto_20161215_1535.py diff --git a/django/engagementmanager/migrations/0018_set_old_notif_true.py b/django/engagementmanager/migrations/0018_set_old_notif_true.py index 76e8265..76e8265 100755..100644 --- a/django/engagementmanager/migrations/0018_set_old_notif_true.py +++ b/django/engagementmanager/migrations/0018_set_old_notif_true.py diff --git a/django/engagementmanager/migrations/0019_auto_20170104_1715.py b/django/engagementmanager/migrations/0019_auto_20170104_1715.py index 329ffa3..329ffa3 100755..100644 --- a/django/engagementmanager/migrations/0019_auto_20170104_1715.py +++ b/django/engagementmanager/migrations/0019_auto_20170104_1715.py diff --git a/django/engagementmanager/migrations/0020_add_indexes_20170108.py b/django/engagementmanager/migrations/0020_add_indexes_20170108.py index 2b71e1e..2b71e1e 100755..100644 --- a/django/engagementmanager/migrations/0020_add_indexes_20170108.py +++ b/django/engagementmanager/migrations/0020_add_indexes_20170108.py diff --git a/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py b/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py index b902df4..b902df4 100755..100644 --- a/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py +++ b/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py diff --git a/django/engagementmanager/migrations/0022_auto_20170118_1520.py b/django/engagementmanager/migrations/0022_auto_20170118_1520.py index b90451b..b90451b 100755..100644 --- a/django/engagementmanager/migrations/0022_auto_20170118_1520.py +++ b/django/engagementmanager/migrations/0022_auto_20170118_1520.py diff --git a/django/engagementmanager/migrations/0023_auto_20170123_1445.py b/django/engagementmanager/migrations/0023_auto_20170123_1445.py index cd01832..cd01832 100755..100644 --- a/django/engagementmanager/migrations/0023_auto_20170123_1445.py +++ b/django/engagementmanager/migrations/0023_auto_20170123_1445.py diff --git a/django/engagementmanager/migrations/0024_auto_20170227_1224.py b/django/engagementmanager/migrations/0024_auto_20170227_1224.py index 3481eb5..3481eb5 100755..100644 --- a/django/engagementmanager/migrations/0024_auto_20170227_1224.py +++ b/django/engagementmanager/migrations/0024_auto_20170227_1224.py diff --git a/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py b/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py index bfec64d..bfec64d 100755..100644 --- a/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py +++ b/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py diff --git a/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py b/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py index 489b6ce..489b6ce 100755..100644 --- a/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py +++ b/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py diff --git a/django/engagementmanager/migrations/0027_add_version_to_vf.py b/django/engagementmanager/migrations/0027_add_version_to_vf.py index 3bd618e..3bd618e 100755..100644 --- a/django/engagementmanager/migrations/0027_add_version_to_vf.py +++ b/django/engagementmanager/migrations/0027_add_version_to_vf.py diff --git a/django/engagementmanager/migrations/0028_auto_20170425_1310.py b/django/engagementmanager/migrations/0028_auto_20170425_1310.py index 68e15f5..68e15f5 100755..100644 --- a/django/engagementmanager/migrations/0028_auto_20170425_1310.py +++ b/django/engagementmanager/migrations/0028_auto_20170425_1310.py diff --git a/django/engagementmanager/migrations/0029_auto_20170504_0749.py b/django/engagementmanager/migrations/0029_auto_20170504_0749.py index f1a4f9a..f1a4f9a 100755..100644 --- a/django/engagementmanager/migrations/0029_auto_20170504_0749.py +++ b/django/engagementmanager/migrations/0029_auto_20170504_0749.py diff --git a/django/engagementmanager/migrations/0030_engagement_archived_time.py b/django/engagementmanager/migrations/0030_engagement_archived_time.py index b24f67a..b24f67a 100755..100644 --- a/django/engagementmanager/migrations/0030_engagement_archived_time.py +++ b/django/engagementmanager/migrations/0030_engagement_archived_time.py diff --git a/django/engagementmanager/migrations/0031_auto_20170620_1312.py b/django/engagementmanager/migrations/0031_auto_20170620_1312.py index f1956c4..f1956c4 100755..100644 --- a/django/engagementmanager/migrations/0031_auto_20170620_1312.py +++ b/django/engagementmanager/migrations/0031_auto_20170620_1312.py diff --git a/django/engagementmanager/migrations/0032_auto_20170702_1435.py b/django/engagementmanager/migrations/0032_auto_20170702_1435.py index 53e5a22..53e5a22 100755..100644 --- a/django/engagementmanager/migrations/0032_auto_20170702_1435.py +++ b/django/engagementmanager/migrations/0032_auto_20170702_1435.py diff --git a/django/engagementmanager/migrations/0033_auto_20170704_0635.py b/django/engagementmanager/migrations/0033_auto_20170704_0635.py index c6d1bb6..c6d1bb6 100755..100644 --- a/django/engagementmanager/migrations/0033_auto_20170704_0635.py +++ b/django/engagementmanager/migrations/0033_auto_20170704_0635.py diff --git a/django/engagementmanager/migrations/0034_engagement_is_with_files.py b/django/engagementmanager/migrations/0034_engagement_is_with_files.py index 01d15f5..01d15f5 100755..100644 --- a/django/engagementmanager/migrations/0034_engagement_is_with_files.py +++ b/django/engagementmanager/migrations/0034_engagement_is_with_files.py diff --git a/django/engagementmanager/migrations/0035_rgwa_fields.py b/django/engagementmanager/migrations/0035_rgwa_fields.py index cce62bf..cce62bf 100755..100644 --- a/django/engagementmanager/migrations/0035_rgwa_fields.py +++ b/django/engagementmanager/migrations/0035_rgwa_fields.py diff --git a/django/engagementmanager/migrations/0036_auto_20170906_0935.py b/django/engagementmanager/migrations/0036_auto_20170906_0935.py index 7c85b6c..7c85b6c 100755..100644 --- a/django/engagementmanager/migrations/0036_auto_20170906_0935.py +++ b/django/engagementmanager/migrations/0036_auto_20170906_0935.py diff --git a/django/engagementmanager/migrations/__init__.py b/django/engagementmanager/migrations/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/migrations/__init__.py +++ b/django/engagementmanager/migrations/__init__.py diff --git a/django/engagementmanager/models.py b/django/engagementmanager/models.py index 71deb84..71deb84 100755..100644 --- a/django/engagementmanager/models.py +++ b/django/engagementmanager/models.py diff --git a/django/engagementmanager/nextsteps.py b/django/engagementmanager/nextsteps.py index 3fee019..3fee019 100755..100644 --- a/django/engagementmanager/nextsteps.py +++ b/django/engagementmanager/nextsteps.py diff --git a/django/engagementmanager/notifications.py b/django/engagementmanager/notifications.py index 59f2e1f..59f2e1f 100755..100644 --- a/django/engagementmanager/notifications.py +++ b/django/engagementmanager/notifications.py diff --git a/django/engagementmanager/rest/__init__.py b/django/engagementmanager/rest/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/rest/__init__.py +++ b/django/engagementmanager/rest/__init__.py diff --git a/django/engagementmanager/rest/activation.py b/django/engagementmanager/rest/activation.py index 3499b95..3499b95 100755..100644 --- a/django/engagementmanager/rest/activation.py +++ b/django/engagementmanager/rest/activation.py diff --git a/django/engagementmanager/rest/activity.py b/django/engagementmanager/rest/activity.py index 47b4cc7..47b4cc7 100755..100644 --- a/django/engagementmanager/rest/activity.py +++ b/django/engagementmanager/rest/activity.py diff --git a/django/engagementmanager/rest/checklist.py b/django/engagementmanager/rest/checklist.py index 200dcaa..200dcaa 100755..100644 --- a/django/engagementmanager/rest/checklist.py +++ b/django/engagementmanager/rest/checklist.py diff --git a/django/engagementmanager/rest/checklist_audit_log.py b/django/engagementmanager/rest/checklist_audit_log.py index 4b86a33..4b86a33 100755..100644 --- a/django/engagementmanager/rest/checklist_audit_log.py +++ b/django/engagementmanager/rest/checklist_audit_log.py diff --git a/django/engagementmanager/rest/checklist_decision.py b/django/engagementmanager/rest/checklist_decision.py index a0cfe01..a0cfe01 100755..100644 --- a/django/engagementmanager/rest/checklist_decision.py +++ b/django/engagementmanager/rest/checklist_decision.py diff --git a/django/engagementmanager/rest/checklist_set_state.py b/django/engagementmanager/rest/checklist_set_state.py index e9c6eb3..e9c6eb3 100755..100644 --- a/django/engagementmanager/rest/checklist_set_state.py +++ b/django/engagementmanager/rest/checklist_set_state.py diff --git a/django/engagementmanager/rest/cms/__init__.py b/django/engagementmanager/rest/cms/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/rest/cms/__init__.py +++ b/django/engagementmanager/rest/cms/__init__.py diff --git a/django/engagementmanager/rest/cms/pages.py b/django/engagementmanager/rest/cms/pages.py index efe0b4e..efe0b4e 100755..100644 --- a/django/engagementmanager/rest/cms/pages.py +++ b/django/engagementmanager/rest/cms/pages.py diff --git a/django/engagementmanager/rest/cms/posts.py b/django/engagementmanager/rest/cms/posts.py index 17e33fb..17e33fb 100755..100644 --- a/django/engagementmanager/rest/cms/posts.py +++ b/django/engagementmanager/rest/cms/posts.py diff --git a/django/engagementmanager/rest/csrf_exempt_session_authentication.py b/django/engagementmanager/rest/csrf_exempt_session_authentication.py index 89a6243..89a6243 100755..100644 --- a/django/engagementmanager/rest/csrf_exempt_session_authentication.py +++ b/django/engagementmanager/rest/csrf_exempt_session_authentication.py diff --git a/django/engagementmanager/rest/data_loader.py b/django/engagementmanager/rest/data_loader.py index 11e8dfc..11e8dfc 100755..100644 --- a/django/engagementmanager/rest/data_loader.py +++ b/django/engagementmanager/rest/data_loader.py diff --git a/django/engagementmanager/rest/deployment_target.py b/django/engagementmanager/rest/deployment_target.py index c52d9b9..c52d9b9 100755..100644 --- a/django/engagementmanager/rest/deployment_target.py +++ b/django/engagementmanager/rest/deployment_target.py diff --git a/django/engagementmanager/rest/deployment_target_site.py b/django/engagementmanager/rest/deployment_target_site.py index 32ff5a4..32ff5a4 100755..100644 --- a/django/engagementmanager/rest/deployment_target_site.py +++ b/django/engagementmanager/rest/deployment_target_site.py diff --git a/django/engagementmanager/rest/ecomp.py b/django/engagementmanager/rest/ecomp.py index a2585ac..a2585ac 100755..100644 --- a/django/engagementmanager/rest/ecomp.py +++ b/django/engagementmanager/rest/ecomp.py diff --git a/django/engagementmanager/rest/engagement.py b/django/engagementmanager/rest/engagement.py index 89e74fe..89e74fe 100755..100644 --- a/django/engagementmanager/rest/engagement.py +++ b/django/engagementmanager/rest/engagement.py diff --git a/django/engagementmanager/rest/feedback.py b/django/engagementmanager/rest/feedback.py index b8075b8..b8075b8 100755..100644 --- a/django/engagementmanager/rest/feedback.py +++ b/django/engagementmanager/rest/feedback.py diff --git a/django/engagementmanager/rest/invite.py b/django/engagementmanager/rest/invite.py index 8060a69..8060a69 100755..100644 --- a/django/engagementmanager/rest/invite.py +++ b/django/engagementmanager/rest/invite.py diff --git a/django/engagementmanager/rest/login.py b/django/engagementmanager/rest/login.py index 53b906b..53b906b 100755..100644 --- a/django/engagementmanager/rest/login.py +++ b/django/engagementmanager/rest/login.py diff --git a/django/engagementmanager/rest/nextsteps.py b/django/engagementmanager/rest/nextsteps.py index 7d4f850..7d4f850 100755..100644 --- a/django/engagementmanager/rest/nextsteps.py +++ b/django/engagementmanager/rest/nextsteps.py diff --git a/django/engagementmanager/rest/notification.py b/django/engagementmanager/rest/notification.py index 34c4a7b..34c4a7b 100755..100644 --- a/django/engagementmanager/rest/notification.py +++ b/django/engagementmanager/rest/notification.py diff --git a/django/engagementmanager/rest/parsers.py b/django/engagementmanager/rest/parsers.py index fce516a..fce516a 100755..100644 --- a/django/engagementmanager/rest/parsers.py +++ b/django/engagementmanager/rest/parsers.py diff --git a/django/engagementmanager/rest/signup.py b/django/engagementmanager/rest/signup.py index 85d63cd..85d63cd 100755..100644 --- a/django/engagementmanager/rest/signup.py +++ b/django/engagementmanager/rest/signup.py diff --git a/django/engagementmanager/rest/user.py b/django/engagementmanager/rest/user.py index 13fc916..13fc916 100755..100644 --- a/django/engagementmanager/rest/user.py +++ b/django/engagementmanager/rest/user.py diff --git a/django/engagementmanager/rest/validation_details.py b/django/engagementmanager/rest/validation_details.py index 1f1a929..1f1a929 100755..100644 --- a/django/engagementmanager/rest/validation_details.py +++ b/django/engagementmanager/rest/validation_details.py diff --git a/django/engagementmanager/rest/vendor.py b/django/engagementmanager/rest/vendor.py index b6ae351..b6ae351 100755..100644 --- a/django/engagementmanager/rest/vendor.py +++ b/django/engagementmanager/rest/vendor.py diff --git a/django/engagementmanager/rest/vf.py b/django/engagementmanager/rest/vf.py index 23ee5b9..23ee5b9 100755..100644 --- a/django/engagementmanager/rest/vf.py +++ b/django/engagementmanager/rest/vf.py diff --git a/django/engagementmanager/rest/vfc.py b/django/engagementmanager/rest/vfc.py index 9ebf3bc..9ebf3bc 100755..100644 --- a/django/engagementmanager/rest/vfc.py +++ b/django/engagementmanager/rest/vfc.py diff --git a/django/engagementmanager/rest/vvp_api_view.py b/django/engagementmanager/rest/vvp_api_view.py index 4abe086..4abe086 100755..100644 --- a/django/engagementmanager/rest/vvp_api_view.py +++ b/django/engagementmanager/rest/vvp_api_view.py diff --git a/django/engagementmanager/scheduled_jobs.py b/django/engagementmanager/scheduled_jobs.py index 9430ff6..9430ff6 100755..100644 --- a/django/engagementmanager/scheduled_jobs.py +++ b/django/engagementmanager/scheduled_jobs.py diff --git a/django/engagementmanager/serializers.py b/django/engagementmanager/serializers.py index e3e88b0..e3e88b0 100755..100644 --- a/django/engagementmanager/serializers.py +++ b/django/engagementmanager/serializers.py diff --git a/django/engagementmanager/service/__init__.py b/django/engagementmanager/service/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/service/__init__.py +++ b/django/engagementmanager/service/__init__.py diff --git a/django/engagementmanager/service/activities_service.py b/django/engagementmanager/service/activities_service.py index b7edca4..b7edca4 100755..100644 --- a/django/engagementmanager/service/activities_service.py +++ b/django/engagementmanager/service/activities_service.py diff --git a/django/engagementmanager/service/authorization_service.py b/django/engagementmanager/service/authorization_service.py index c850b4a..c850b4a 100755..100644 --- a/django/engagementmanager/service/authorization_service.py +++ b/django/engagementmanager/service/authorization_service.py diff --git a/django/engagementmanager/service/base_service.py b/django/engagementmanager/service/base_service.py index 93e48f8..93e48f8 100755..100644 --- a/django/engagementmanager/service/base_service.py +++ b/django/engagementmanager/service/base_service.py diff --git a/django/engagementmanager/service/bus_service.py b/django/engagementmanager/service/bus_service.py index 5096fbb..5096fbb 100755..100644 --- a/django/engagementmanager/service/bus_service.py +++ b/django/engagementmanager/service/bus_service.py diff --git a/django/engagementmanager/service/checklist_audit_log_service.py b/django/engagementmanager/service/checklist_audit_log_service.py index f726950..f726950 100755..100644 --- a/django/engagementmanager/service/checklist_audit_log_service.py +++ b/django/engagementmanager/service/checklist_audit_log_service.py diff --git a/django/engagementmanager/service/checklist_decision_service.py b/django/engagementmanager/service/checklist_decision_service.py index e94c059..e94c059 100755..100644 --- a/django/engagementmanager/service/checklist_decision_service.py +++ b/django/engagementmanager/service/checklist_decision_service.py diff --git a/django/engagementmanager/service/checklist_service.py b/django/engagementmanager/service/checklist_service.py index 0df7edd..0df7edd 100755..100644 --- a/django/engagementmanager/service/checklist_service.py +++ b/django/engagementmanager/service/checklist_service.py diff --git a/django/engagementmanager/service/checklist_state_service.py b/django/engagementmanager/service/checklist_state_service.py index 1903c47..1903c47 100755..100644 --- a/django/engagementmanager/service/checklist_state_service.py +++ b/django/engagementmanager/service/checklist_state_service.py diff --git a/django/engagementmanager/service/cms/__init__.py b/django/engagementmanager/service/cms/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/service/cms/__init__.py +++ b/django/engagementmanager/service/cms/__init__.py diff --git a/django/engagementmanager/service/cms/base_cms.py b/django/engagementmanager/service/cms/base_cms.py index 8625d88..8625d88 100755..100644 --- a/django/engagementmanager/service/cms/base_cms.py +++ b/django/engagementmanager/service/cms/base_cms.py diff --git a/django/engagementmanager/service/cms/pages_service.py b/django/engagementmanager/service/cms/pages_service.py index ab6fc96..ab6fc96 100755..100644 --- a/django/engagementmanager/service/cms/pages_service.py +++ b/django/engagementmanager/service/cms/pages_service.py diff --git a/django/engagementmanager/service/cms/posts_service.py b/django/engagementmanager/service/cms/posts_service.py index 720f766..720f766 100755..100644 --- a/django/engagementmanager/service/cms/posts_service.py +++ b/django/engagementmanager/service/cms/posts_service.py diff --git a/django/engagementmanager/service/deploment_target_service.py b/django/engagementmanager/service/deploment_target_service.py index 69c5e6f..69c5e6f 100755..100644 --- a/django/engagementmanager/service/deploment_target_service.py +++ b/django/engagementmanager/service/deploment_target_service.py diff --git a/django/engagementmanager/service/ecomp_service.py b/django/engagementmanager/service/ecomp_service.py index d151ac0..d151ac0 100755..100644 --- a/django/engagementmanager/service/ecomp_service.py +++ b/django/engagementmanager/service/ecomp_service.py diff --git a/django/engagementmanager/service/engagement_service.py b/django/engagementmanager/service/engagement_service.py index 628bc57..628bc57 100755..100644 --- a/django/engagementmanager/service/engagement_service.py +++ b/django/engagementmanager/service/engagement_service.py diff --git a/django/engagementmanager/service/invite_service.py b/django/engagementmanager/service/invite_service.py index c4780fd..c4780fd 100755..100644 --- a/django/engagementmanager/service/invite_service.py +++ b/django/engagementmanager/service/invite_service.py diff --git a/django/engagementmanager/service/logging_service.py b/django/engagementmanager/service/logging_service.py index b90bdbf..b90bdbf 100755..100644 --- a/django/engagementmanager/service/logging_service.py +++ b/django/engagementmanager/service/logging_service.py diff --git a/django/engagementmanager/service/login_service.py b/django/engagementmanager/service/login_service.py index 7216b56..7216b56 100755..100644 --- a/django/engagementmanager/service/login_service.py +++ b/django/engagementmanager/service/login_service.py diff --git a/django/engagementmanager/service/nextstep_service.py b/django/engagementmanager/service/nextstep_service.py index 9fa8672..9fa8672 100755..100644 --- a/django/engagementmanager/service/nextstep_service.py +++ b/django/engagementmanager/service/nextstep_service.py diff --git a/django/engagementmanager/service/user_service.py b/django/engagementmanager/service/user_service.py index 8d6317e..8d6317e 100755..100644 --- a/django/engagementmanager/service/user_service.py +++ b/django/engagementmanager/service/user_service.py diff --git a/django/engagementmanager/service/vf_service.py b/django/engagementmanager/service/vf_service.py index aa3a9d3..aa3a9d3 100755..100644 --- a/django/engagementmanager/service/vf_service.py +++ b/django/engagementmanager/service/vf_service.py diff --git a/django/engagementmanager/service/vfc_service.py b/django/engagementmanager/service/vfc_service.py index 341cfc1..341cfc1 100755..100644 --- a/django/engagementmanager/service/vfc_service.py +++ b/django/engagementmanager/service/vfc_service.py diff --git a/django/engagementmanager/slack_client/__init__.py b/django/engagementmanager/slack_client/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/slack_client/__init__.py +++ b/django/engagementmanager/slack_client/__init__.py diff --git a/django/engagementmanager/slack_client/api.py b/django/engagementmanager/slack_client/api.py index f006322..f006322 100755..100644 --- a/django/engagementmanager/slack_client/api.py +++ b/django/engagementmanager/slack_client/api.py diff --git a/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql b/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql index 79925be..79925be 100755..100644 --- a/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql +++ b/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql diff --git a/django/engagementmanager/templatetags/__init__.py b/django/engagementmanager/templatetags/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/templatetags/__init__.py +++ b/django/engagementmanager/templatetags/__init__.py diff --git a/django/engagementmanager/templatetags/vvptags.py b/django/engagementmanager/templatetags/vvptags.py index 1a6a0ee..1a6a0ee 100755..100644 --- a/django/engagementmanager/templatetags/vvptags.py +++ b/django/engagementmanager/templatetags/vvptags.py diff --git a/django/engagementmanager/tests/__init__.py b/django/engagementmanager/tests/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/tests/__init__.py +++ b/django/engagementmanager/tests/__init__.py diff --git a/django/engagementmanager/tests/test_access_credentials.py b/django/engagementmanager/tests/test_access_credentials.py index 73d427c..73d427c 100755..100644 --- a/django/engagementmanager/tests/test_access_credentials.py +++ b/django/engagementmanager/tests/test_access_credentials.py diff --git a/django/engagementmanager/tests/test_activation.py b/django/engagementmanager/tests/test_activation.py index a845373..a845373 100755..100644 --- a/django/engagementmanager/tests/test_activation.py +++ b/django/engagementmanager/tests/test_activation.py diff --git a/django/engagementmanager/tests/test_activities.py b/django/engagementmanager/tests/test_activities.py index 9e83e9f..9e83e9f 100755..100644 --- a/django/engagementmanager/tests/test_activities.py +++ b/django/engagementmanager/tests/test_activities.py diff --git a/django/engagementmanager/tests/test_add_contact.py b/django/engagementmanager/tests/test_add_contact.py index c1af553..c1af553 100755..100644 --- a/django/engagementmanager/tests/test_add_contact.py +++ b/django/engagementmanager/tests/test_add_contact.py diff --git a/django/engagementmanager/tests/test_add_feedback.py b/django/engagementmanager/tests/test_add_feedback.py index 33382aa..33382aa 100755..100644 --- a/django/engagementmanager/tests/test_add_feedback.py +++ b/django/engagementmanager/tests/test_add_feedback.py diff --git a/django/engagementmanager/tests/test_add_next_step_to_checklist.py b/django/engagementmanager/tests/test_add_next_step_to_checklist.py index e88cddd..e88cddd 100755..100644 --- a/django/engagementmanager/tests/test_add_next_step_to_checklist.py +++ b/django/engagementmanager/tests/test_add_next_step_to_checklist.py diff --git a/django/engagementmanager/tests/test_audit_log_and_decision_api.py b/django/engagementmanager/tests/test_audit_log_and_decision_api.py index 42395ae..42395ae 100755..100644 --- a/django/engagementmanager/tests/test_audit_log_and_decision_api.py +++ b/django/engagementmanager/tests/test_audit_log_and_decision_api.py diff --git a/django/engagementmanager/tests/test_auth_service.py b/django/engagementmanager/tests/test_auth_service.py index b61de8d..b61de8d 100755..100644 --- a/django/engagementmanager/tests/test_auth_service.py +++ b/django/engagementmanager/tests/test_auth_service.py diff --git a/django/engagementmanager/tests/test_base_entity.py b/django/engagementmanager/tests/test_base_entity.py index a90be1f..b6a5ece 100755..100644 --- a/django/engagementmanager/tests/test_base_entity.py +++ b/django/engagementmanager/tests/test_base_entity.py @@ -59,7 +59,7 @@ class TestBaseEntity(TestCase): def setUp(self): logger.debug("---------------------- TestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.conn = http.client.HTTPConnection("127.0.0.1", 8000) # @UndefinedVariable self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_base_transaction_entity.py b/django/engagementmanager/tests/test_base_transaction_entity.py index c4a5159..e206bad 100755..100644 --- a/django/engagementmanager/tests/test_base_transaction_entity.py +++ b/django/engagementmanager/tests/test_base_transaction_entity.py @@ -53,7 +53,7 @@ class TestBaseTransactionEntity(TransactionTestCase): def setUp(self): logger.debug("---------------------- TransactionTestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.conn = http.client.HTTPConnection("127.0.0.1", 8000) # @UndefinedVariable self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_checklist.py b/django/engagementmanager/tests/test_checklist.py index a7fa800..a7fa800 100755..100644 --- a/django/engagementmanager/tests/test_checklist.py +++ b/django/engagementmanager/tests/test_checklist.py diff --git a/django/engagementmanager/tests/test_checklist_template.py b/django/engagementmanager/tests/test_checklist_template.py index c3c63e4..c3c63e4 100755..100644 --- a/django/engagementmanager/tests/test_checklist_template.py +++ b/django/engagementmanager/tests/test_checklist_template.py diff --git a/django/engagementmanager/tests/test_cms_documentation_search.py b/django/engagementmanager/tests/test_cms_documentation_search.py index 2d13f96..2d13f96 100755..100644 --- a/django/engagementmanager/tests/test_cms_documentation_search.py +++ b/django/engagementmanager/tests/test_cms_documentation_search.py diff --git a/django/engagementmanager/tests/test_cms_pages.py b/django/engagementmanager/tests/test_cms_pages.py index 4fd9473..4fd9473 100755..100644 --- a/django/engagementmanager/tests/test_cms_pages.py +++ b/django/engagementmanager/tests/test_cms_pages.py diff --git a/django/engagementmanager/tests/test_cms_posts.py b/django/engagementmanager/tests/test_cms_posts.py index 7132c2c..7132c2c 100755..100644 --- a/django/engagementmanager/tests/test_cms_posts.py +++ b/django/engagementmanager/tests/test_cms_posts.py diff --git a/django/engagementmanager/tests/test_deployment_target_sites.py b/django/engagementmanager/tests/test_deployment_target_sites.py index ddfb448..ddfb448 100755..100644 --- a/django/engagementmanager/tests/test_deployment_target_sites.py +++ b/django/engagementmanager/tests/test_deployment_target_sites.py diff --git a/django/engagementmanager/tests/test_digest_email_notifications.py b/django/engagementmanager/tests/test_digest_email_notifications.py index b3e75df..b3e75df 100755..100644 --- a/django/engagementmanager/tests/test_digest_email_notifications.py +++ b/django/engagementmanager/tests/test_digest_email_notifications.py diff --git a/django/engagementmanager/tests/test_eng_progress.py b/django/engagementmanager/tests/test_eng_progress.py index 563c3cd..563c3cd 100755..100644 --- a/django/engagementmanager/tests/test_eng_progress.py +++ b/django/engagementmanager/tests/test_eng_progress.py diff --git a/django/engagementmanager/tests/test_eng_status.py b/django/engagementmanager/tests/test_eng_status.py index 62f787d..62f787d 100755..100644 --- a/django/engagementmanager/tests/test_eng_status.py +++ b/django/engagementmanager/tests/test_eng_status.py diff --git a/django/engagementmanager/tests/test_engagement_admin_operations.py b/django/engagementmanager/tests/test_engagement_admin_operations.py index a50e49f..a50e49f 100755..100644 --- a/django/engagementmanager/tests/test_engagement_admin_operations.py +++ b/django/engagementmanager/tests/test_engagement_admin_operations.py diff --git a/django/engagementmanager/tests/test_engagement_export.py b/django/engagementmanager/tests/test_engagement_export.py index 9cbceb0..7438658 100755..100644 --- a/django/engagementmanager/tests/test_engagement_export.py +++ b/django/engagementmanager/tests/test_engagement_export.py @@ -43,6 +43,7 @@ from engagementmanager.service.engagement_service import get_expanded_engs_for_e from engagementmanager.tests.test_base_entity import TestBaseEntity from engagementmanager.utils.constants import EngagementStage, Constants from engagementmanager.service.logging_service import LoggingServiceFactory +from django.conf import settings logger = LoggingServiceFactory.get_logger() @@ -112,6 +113,9 @@ class EngagementExportTestCase(TestBaseEntity): def testSuccessExport(self): self.printTestName("Success export [start]") + if settings.DATABASES["default"]["ENGINE"] == "django.db.backends.sqlite3": + return + urlStr = self.urlPrefix + 'engagement/export/?stage=Active&keyword' logger.debug( "action should success (200), and return one active engagement") diff --git a/django/engagementmanager/tests/test_expanded_eng.py b/django/engagementmanager/tests/test_expanded_eng.py index ec89d0b..ec89d0b 100755..100644 --- a/django/engagementmanager/tests/test_expanded_eng.py +++ b/django/engagementmanager/tests/test_expanded_eng.py diff --git a/django/engagementmanager/tests/test_import_engagement_xls.py b/django/engagementmanager/tests/test_import_engagement_xls.py index 8513998..8513998 100755..100644 --- a/django/engagementmanager/tests/test_import_engagement_xls.py +++ b/django/engagementmanager/tests/test_import_engagement_xls.py diff --git a/django/engagementmanager/tests/test_invite_members.py b/django/engagementmanager/tests/test_invite_members.py index 460eded..460eded 100755..100644 --- a/django/engagementmanager/tests/test_invite_members.py +++ b/django/engagementmanager/tests/test_invite_members.py diff --git a/django/engagementmanager/tests/test_next_steps.py b/django/engagementmanager/tests/test_next_steps.py index 95a8227..95a8227 100755..100644 --- a/django/engagementmanager/tests/test_next_steps.py +++ b/django/engagementmanager/tests/test_next_steps.py diff --git a/django/engagementmanager/tests/test_next_steps_api.py b/django/engagementmanager/tests/test_next_steps_api.py index b0be468..b0be468 100755..100644 --- a/django/engagementmanager/tests/test_next_steps_api.py +++ b/django/engagementmanager/tests/test_next_steps_api.py diff --git a/django/engagementmanager/tests/test_notify_inactive_engagements.py b/django/engagementmanager/tests/test_notify_inactive_engagements.py index afeb835..afeb835 100755..100644 --- a/django/engagementmanager/tests/test_notify_inactive_engagements.py +++ b/django/engagementmanager/tests/test_notify_inactive_engagements.py diff --git a/django/engagementmanager/tests/test_pull_notifications.py b/django/engagementmanager/tests/test_pull_notifications.py index 1c22437..1c22437 100755..100644 --- a/django/engagementmanager/tests/test_pull_notifications.py +++ b/django/engagementmanager/tests/test_pull_notifications.py diff --git a/django/engagementmanager/tests/test_rados_gateway.py b/django/engagementmanager/tests/test_rados_gateway.py index 0d81ecc..0d81ecc 100755..100644 --- a/django/engagementmanager/tests/test_rados_gateway.py +++ b/django/engagementmanager/tests/test_rados_gateway.py diff --git a/django/engagementmanager/tests/test_remove_user_from_eng_team.py b/django/engagementmanager/tests/test_remove_user_from_eng_team.py index 15bcf2d..15bcf2d 100755..100644 --- a/django/engagementmanager/tests/test_remove_user_from_eng_team.py +++ b/django/engagementmanager/tests/test_remove_user_from_eng_team.py diff --git a/django/engagementmanager/tests/test_request_data_manager.py b/django/engagementmanager/tests/test_request_data_manager.py index 580301e..13e4fe0 100755..100644 --- a/django/engagementmanager/tests/test_request_data_manager.py +++ b/django/engagementmanager/tests/test_request_data_manager.py @@ -45,6 +45,8 @@ from django.db import connections from django.test.client import Client from django.test.testcases import TransactionTestCase from rest_framework.status import HTTP_401_UNAUTHORIZED, HTTP_200_OK + +from django.conf import settings from engagementmanager.models import Vendor from engagementmanager.tests.vvpEntitiesCreator import VvpEntitiesCreator from engagementmanager.utils.authentication import JWTAuthentication @@ -59,7 +61,7 @@ class TestRequestDataManager(TransactionTestCase): def childSetup(self): logger.debug("---------------------- TestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_resend_activation_email.py b/django/engagementmanager/tests/test_resend_activation_email.py index b544001..b544001 100755..100644 --- a/django/engagementmanager/tests/test_resend_activation_email.py +++ b/django/engagementmanager/tests/test_resend_activation_email.py diff --git a/django/engagementmanager/tests/test_reset_password.py b/django/engagementmanager/tests/test_reset_password.py index 7cfdd54..7cfdd54 100755..100644 --- a/django/engagementmanager/tests/test_reset_password.py +++ b/django/engagementmanager/tests/test_reset_password.py diff --git a/django/engagementmanager/tests/test_rgwa_client.py b/django/engagementmanager/tests/test_rgwa_client.py index a65f5b3..a65f5b3 100755..100644 --- a/django/engagementmanager/tests/test_rgwa_client.py +++ b/django/engagementmanager/tests/test_rgwa_client.py diff --git a/django/engagementmanager/tests/test_set_checklist_state.py b/django/engagementmanager/tests/test_set_checklist_state.py index 54d3c8e..1b986ae 100755..100644 --- a/django/engagementmanager/tests/test_set_checklist_state.py +++ b/django/engagementmanager/tests/test_set_checklist_state.py @@ -45,11 +45,19 @@ from rest_framework.status import HTTP_200_OK from uuid import uuid4 import json from engagementmanager.service.logging_service import LoggingServiceFactory +from mocks.jenkins_mock.services.jenkins_tests_validation_service import JenkinsTestsResultsSvc logger = LoggingServiceFactory.get_logger() class TestChecklistSetState(TestBaseEntity): + def initCLBody(self): + self.clbodydata['checkListName'] = ChecklistDefaultNames.HEAT_TEMPLATES + self.clbodydata['checkListTemplateUuid'] = str(self.template.uuid) + self.clbodydata['checkListAssociatedFiles'] =\ + "[\"file0/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"," \ + " \"file1/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"," \ + " \"file2/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"]" def childSetup(self): self.createVendors([Constants.service_provider_company_name, 'Amdocs']) @@ -82,29 +90,22 @@ class TestChecklistSetState(TestBaseEntity): self.deploymentTarget = self.creator.createDeploymentTarget( self.randomGenerator("randomString"), self.randomGenerator("randomString")) -# self.asInfrastructure = self.creator.createApplicationServiceInfrastructure(self.randomGenerator("randomString")) self.vf = self.creator.createVF(self.randomGenerator("randomString"), self.engagement, self.deploymentTarget, False, self.vendor) -# self.vf.service_infrastructures.add(self.asInfrastructure) self.clbodydata = dict() self.initCLBody() self.checklist = Checklist.objects.create(uuid=uuid4(), name=self.clbodydata['checkListName'], validation_cycle=1, associated_files=self.clbodydata[ 'checkListAssociatedFiles'], engagement=self.engagement, template=self.template, creator=self.el_user, owner=self.el_user) self.checklist.save() - self.section = ChecklistSection.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), validation_instructions=self.randomGenerator("randomString"), template=self.template) - self.section.save() - self.line_item = ChecklistLineItem.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), line_type=CheckListLineType.auto.name, validation_instructions=self.randomGenerator("randomString"), template=self.template, section=self.section) # @UndefinedVariable - self.line_item2 = ChecklistLineItem.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), line_type=CheckListLineType.auto.name, validation_instructions=self.randomGenerator("randomString"), template=self.template, section=self.section) # @UndefinedVariable - self.line_item.save() - self.line_item2.save() + + self.line_items = ChecklistLineItem.objects.filter( + template=self.checklist.template)[:JenkinsTestsResultsSvc().num_of_auto_tests] + self.decision = ChecklistDecision.objects.create( - uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_item) + uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_items[0]) self.decision2 = ChecklistDecision.objects.create( - uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_item2) + uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_items[1]) self.decision.save() self.decision2.save() self.data = dict() diff --git a/django/engagementmanager/tests/test_set_eng_stage.py b/django/engagementmanager/tests/test_set_eng_stage.py index f26b70b..f26b70b 100755..100644 --- a/django/engagementmanager/tests/test_set_eng_stage.py +++ b/django/engagementmanager/tests/test_set_eng_stage.py diff --git a/django/engagementmanager/tests/test_update_password.py b/django/engagementmanager/tests/test_update_password.py index 08b25b2..08b25b2 100755..100644 --- a/django/engagementmanager/tests/test_update_password.py +++ b/django/engagementmanager/tests/test_update_password.py diff --git a/django/engagementmanager/tests/test_update_user_account.py b/django/engagementmanager/tests/test_update_user_account.py index fd0becd..fd0becd 100755..100644 --- a/django/engagementmanager/tests/test_update_user_account.py +++ b/django/engagementmanager/tests/test_update_user_account.py diff --git a/django/engagementmanager/tests/test_vfc.py b/django/engagementmanager/tests/test_vfc.py index e7f374a..e7f374a 100755..100644 --- a/django/engagementmanager/tests/test_vfc.py +++ b/django/engagementmanager/tests/test_vfc.py diff --git a/django/engagementmanager/tests/vvpEntitiesCreator.py b/django/engagementmanager/tests/vvpEntitiesCreator.py index 0ba619e..0ba619e 100755..100644 --- a/django/engagementmanager/tests/vvpEntitiesCreator.py +++ b/django/engagementmanager/tests/vvpEntitiesCreator.py diff --git a/django/engagementmanager/urls.py b/django/engagementmanager/urls.py index 9cc5be3..9cc5be3 100755..100644 --- a/django/engagementmanager/urls.py +++ b/django/engagementmanager/urls.py diff --git a/django/engagementmanager/utils/__init__.py b/django/engagementmanager/utils/__init__.py index 371b694..371b694 100755..100644 --- a/django/engagementmanager/utils/__init__.py +++ b/django/engagementmanager/utils/__init__.py diff --git a/django/engagementmanager/utils/activities_data.py b/django/engagementmanager/utils/activities_data.py index 24275d6..24275d6 100755..100644 --- a/django/engagementmanager/utils/activities_data.py +++ b/django/engagementmanager/utils/activities_data.py diff --git a/django/engagementmanager/utils/authentication.py b/django/engagementmanager/utils/authentication.py index 6a857d6..6a857d6 100755..100644 --- a/django/engagementmanager/utils/authentication.py +++ b/django/engagementmanager/utils/authentication.py diff --git a/django/engagementmanager/utils/choice_enum.py b/django/engagementmanager/utils/choice_enum.py index ef19de2..ef19de2 100755..100644 --- a/django/engagementmanager/utils/choice_enum.py +++ b/django/engagementmanager/utils/choice_enum.py diff --git a/django/engagementmanager/utils/constants.py b/django/engagementmanager/utils/constants.py index c5b1ae9..70fab7b 100755..100644 --- a/django/engagementmanager/utils/constants.py +++ b/django/engagementmanager/utils/constants.py @@ -54,17 +54,17 @@ class Constants(object): role_standard_user = None role_admin = None role_admin_ro = None - service_provider_company_name = "ExampleServiceProvider" - service_provider_mail_domain = ["example.com"] - service_provider_admin_mail = "admin@example.com" - service_provider_admin_ro_mail = "admin_ro@example.com" + service_provider_company_name = "ServiceProvider" + service_provider_mail_domain = ["example-domain.com"] + service_provider_admin_mail = "admin@example-domain.com" + service_provider_admin_ro_mail = "admin_ro@example-domain.com" ice_base_ctx = "/vvp/v1/engmgr/" rgwa_base_url ='http://localhost:8123/admin' default_vfc_version = "1.0.0" dbConnectionStr = "dbname='icedb' user='iceuser' host='localhost' password='Aa123456' port='5433'" dashboard_href = "<A href=" + \ str(settings.DOMAIN) + "/#/dashboard/" + ">Dashboard</A>" - prodDomain = 'https://www.vvp.example.com' + prodDomain = 'https://www.vvp.example-domain.com' invite_template_dir = "emails/invite/" activate_template_dir = "emails/activate/" notification_template_dir = "emails/notification/" diff --git a/django/engagementmanager/utils/cryptography.py b/django/engagementmanager/utils/cryptography.py index 723efa0..723efa0 100755..100644 --- a/django/engagementmanager/utils/cryptography.py +++ b/django/engagementmanager/utils/cryptography.py diff --git a/django/engagementmanager/utils/dates.py b/django/engagementmanager/utils/dates.py index db1d8fe..db1d8fe 100755..100644 --- a/django/engagementmanager/utils/dates.py +++ b/django/engagementmanager/utils/dates.py diff --git a/django/engagementmanager/utils/exception_handler.py b/django/engagementmanager/utils/exception_handler.py index b1b46ee..b1b46ee 100755..100644 --- a/django/engagementmanager/utils/exception_handler.py +++ b/django/engagementmanager/utils/exception_handler.py diff --git a/django/engagementmanager/utils/exception_message_factory.py b/django/engagementmanager/utils/exception_message_factory.py index 6ea96f4..6ea96f4 100755..100644 --- a/django/engagementmanager/utils/exception_message_factory.py +++ b/django/engagementmanager/utils/exception_message_factory.py diff --git a/django/engagementmanager/utils/request_data_mgr.py b/django/engagementmanager/utils/request_data_mgr.py index 46557b4..46557b4 100755..100644 --- a/django/engagementmanager/utils/request_data_mgr.py +++ b/django/engagementmanager/utils/request_data_mgr.py diff --git a/django/engagementmanager/utils/validator.py b/django/engagementmanager/utils/validator.py index cef67f6..cef67f6 100755..100644 --- a/django/engagementmanager/utils/validator.py +++ b/django/engagementmanager/utils/validator.py diff --git a/django/engagementmanager/utils/vvp_exceptions.py b/django/engagementmanager/utils/vvp_exceptions.py index 2cc9cee..2cc9cee 100755..100644 --- a/django/engagementmanager/utils/vvp_exceptions.py +++ b/django/engagementmanager/utils/vvp_exceptions.py diff --git a/django/engagementmanager/views_helper.py b/django/engagementmanager/views_helper.py index 418290b..418290b 100755..100644 --- a/django/engagementmanager/views_helper.py +++ b/django/engagementmanager/views_helper.py diff --git a/django/engagementmanager/vm_integration/__init__.py b/django/engagementmanager/vm_integration/__init__.py index 1726c13..1726c13 100755..100644 --- a/django/engagementmanager/vm_integration/__init__.py +++ b/django/engagementmanager/vm_integration/__init__.py diff --git a/django/engagementmanager/vm_integration/em_api.py b/django/engagementmanager/vm_integration/em_api.py index b41a3ff..b41a3ff 100755..100644 --- a/django/engagementmanager/vm_integration/em_api.py +++ b/django/engagementmanager/vm_integration/em_api.py diff --git a/django/engagementmanager/vm_integration/vm_client.py b/django/engagementmanager/vm_integration/vm_client.py index 04d77c5..04d77c5 100755..100644 --- a/django/engagementmanager/vm_integration/vm_client.py +++ b/django/engagementmanager/vm_integration/vm_client.py |