Skip to content

Commit

Permalink
Always show list of recipients to whistleblowers
Browse files Browse the repository at this point in the history
  • Loading branch information
evilaliv3 committed Dec 30, 2023
1 parent de7f328 commit 3950d3f
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 20 deletions.
1 change: 0 additions & 1 deletion backend/globaleaks/db/migrations/update_46/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class Context_v_45(Model):
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_context = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/db/migrations/update_47/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class Context_v_46(Model):
id = Column(UnicodeText(36), primary_key=True, default=uuid4, nullable=False)
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/db/migrations/update_52/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class Context_v_51(Model):
id = Column(UnicodeText(36), primary_key=True, default=uuid4)
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/db/migrations/update_62/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class Context_v_61(Model):
id = Column(UnicodeText(36), primary_key=True, default=uuid4)
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/db/migrations/update_64/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class Context_v_63(Model):
id = Column(UnicodeText(36), primary_key=True, default=uuid4)
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/handlers/admin/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def admin_serialize_context(session, context, language):
'tip_reminder': context.tip_reminder,
'select_all_receivers': context.select_all_receivers,
'maximum_selectable_receivers': context.maximum_selectable_receivers,
'show_recipients_details': context.show_recipients_details,
'allow_recipients_selection': context.allow_recipients_selection,
'enable_two_way_comments': context.enable_two_way_comments,
'enable_attachments': context.enable_attachments,
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/handlers/public.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ def serialize_context(session, context, language, data=None):
'tip_reminder': context.tip_reminder,
'select_all_receivers': context.select_all_receivers,
'maximum_selectable_receivers': context.maximum_selectable_receivers,
'show_recipients_details': context.show_recipients_details,
'allow_recipients_selection': context.allow_recipients_selection,
'enable_two_way_comments': context.enable_two_way_comments,
'enable_attachments': context.enable_attachments,
Expand Down
2 changes: 0 additions & 2 deletions backend/globaleaks/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ class _Context(Model):
id = Column(UnicodeText(36), primary_key=True, default=uuid4)
tid = Column(Integer, default=1, nullable=False)
show_steps_navigation_interface = Column(Boolean, default=True, nullable=False)
show_recipients_details = Column(Boolean, default=False, nullable=False)
allow_recipients_selection = Column(Boolean, default=False, nullable=False)
maximum_selectable_receivers = Column(Integer, default=0, nullable=False)
select_all_receivers = Column(Boolean, default=True, nullable=False)
Expand Down Expand Up @@ -364,7 +363,6 @@ class _Context(Model):
'hidden',
'select_all_receivers',
'show_context',
'show_recipients_details',
'show_receivers_in_alphabetical_order',
'show_steps_navigation_interface',
'allow_recipients_selection',
Expand Down
2 changes: 0 additions & 2 deletions backend/globaleaks/rest/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ def get_multilang_request_format(request_format, localized_strings):
'tip_reminder': int,
'receivers': [uuid_regexp],
'select_all_receivers': bool,
'show_recipients_details': bool,
'allow_recipients_selection': bool,
'enable_two_way_comments': bool,
'enable_attachments': bool,
Expand Down Expand Up @@ -469,7 +468,6 @@ def get_multilang_request_format(request_format, localized_strings):
'select_all_receivers': bool,
'tip_timetolive': int,
'tip_reminder': int,
'show_recipients_details': bool,
'allow_recipients_selection': bool,
'maximum_selectable_receivers': int,
'enable_attachments': bool,
Expand Down
1 change: 0 additions & 1 deletion backend/globaleaks/tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ def __init__(self):
'tip_reminder': 80,
'maximum_selectable_receivers': 0,
'show_context': True,
'show_recipients_details': True,
'allow_recipients_selection': False,
'enable_two_way_comments': True,
'enable_attachments': True,
Expand Down
1 change: 0 additions & 1 deletion client/app/js/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ factory("AdminUtils", ["AdminContextResource", "AdminQuestionnaireResource", "Ad
context.tip_timetolive = 90;
context.tip_reminder_hard = 80;
context.tip_reminder_soft = 5;
context.show_recipients_details = false;
context.allow_recipients_selection = false;
context.show_receivers_in_alphabetical_order = true;
context.show_steps_navigation_interface = true;
Expand Down
6 changes: 0 additions & 6 deletions client/app/views/admin/contexts.html
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,6 @@
</label>
</div>
</div>
<div class="form-group">
<label class="inline-checkbox">
<input data-ng-model="context.show_recipients_details" type="checkbox"/>
<span data-translate>Show recipient details on the status page of the report</span>
</label>
</div>
<div class="form-group">
<label class="inline-checkbox">
<input data-ng-model="context.enable_attachments" type="checkbox"/>
Expand Down
2 changes: 1 addition & 1 deletion client/app/views/whistleblower/tip.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12" data-ng-include="'views/partials/tip_info.html'"></div>
</div>
<div class="row" data-ng-if="tip.context.show_recipients_details">
<div class="row" data-ng-if="tip.receivers.length > 1">
<div class="col-md-12" data-ng-include="'views/partials/tip_receiver_list.html'"></div>
</div>
<div class="row">
Expand Down

0 comments on commit 3950d3f

Please sign in to comment.