paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

slack_import: Add instruction to get export file.

Browse Source
This commit is contained in:
Aman Agrawal
2025-05-20 14:48:51 +05:30
committed by Tim Abbott
parent ef8f9f0585
commit e07a17eff5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
templates/zerver/slack_import.html
View File

@@ -63,7 +63,12 @@
</form>
{% if slack_access_token %}
<div class="input-box" id="slack-import-drag-drop-wrapper">
<label for="slack-import-drag-and-drop" class="inline-block label-title">{{ _('Import your data') }}</label>
<label for="slack-import-drag-and-drop" class="inline-block label-title">{{ _('Upload your Slack export file') }}</label>
<div class="not-editable-realm-field">
{% trans %}
Follow <a href="https://zulip.com/help/import-from-slack#export-your-slack-data" target="_blank" rel="noopener noreferrer">these instructions</a> to obtain your Slack message history export.
{% endtrans %}
</div>
<div id="slack-import-drag-and-drop" data-max-file-size="{{max_file_size}}"></div>
</div>
<form id="slack-import-start-upload-wrapper" method="post" class="form-inline {% if uploaded_import_file_name %}{% else %}hidden{% endif %}" action="{{ url('import_realm_from_slack') }}">

5
zerver/views/registration.py
View File

@@ -362,7 +362,10 @@ def registration_helper(
saved_slack_access_token = prereg_realm.data_import_metadata.get("slack_access_token")
if saved_slack_access_token or slack_access_token is not None:
if slack_access_token is not None and slack_access_token != saved_slack_access_token:
if (
slack_access_token is not None
and slack_access_token != saved_slack_access_token
):
# Verify slack token access.
from zerver.data_import.slack import (
SLACK_IMPORT_TOKEN_SCOPES,