-
Notifications
You must be signed in to change notification settings - Fork 51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add online video link to menu #150
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
75e87c1
send invitation for additional speaker input
lcduong ca01cdf
Merge branch 'development' of github.com:lcduong/eventyay-talk into d…
lcduong 2d526db
Merge branch 'development' of github.com:lcduong/eventyay-talk into d…
lcduong 7e73fe8
Merge branch 'development' of github.com:lcduong/eventyay-talk into d…
lcduong ad5860b
Merge branch 'development' of github.com:lcduong/eventyay-talk into d…
lcduong fc163fb
add join video button without token
lcduong f4b7f5f
remove not related file
lcduong 002d845
Merge branch 'development' into feature-133
mariobehling 8a4ca19
Merge branch 'development' into feature-133
odkhang b7514e9
update token for video join button
odkhang 27fdd75
Merge branch 'feature-133' of github.com:lcduong/eventyay-talk into f…
odkhang a41c8ab
Merge branch 'development' into feature-133
odkhang 7733646
Merge branch 'development' into feature-133
lcduong 0e6391e
rework feature add join video on menu
lcduong 30b69ba
fix pipeline isort/black
lcduong File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/pretalx/sso_provider/templates/socialaccount/authentication_error.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
$(function () { | ||
var popup_window = null | ||
var popup_check_interval = null | ||
|
||
$("#join-event-link").on("click", function (e) { | ||
e.preventDefault(); // prevent the default action (redirecting to the href) | ||
var url = $(this).attr('href'); // get the href attribute | ||
$.ajax({ | ||
"method": "GET", | ||
"url": url, | ||
"success": function(json) { | ||
if(json.redirect_url) { | ||
window.location.href = json.redirect_url; | ||
} | ||
}, | ||
"error": function(jqXHR, textStatus, errorThrown) { | ||
// handle any errors that occur while making the AJAX request | ||
$("body").addClass("has-join-popup") | ||
if(jqXHR.responseText === 'user_not_allowed') { | ||
// handle 'user_not_allowed' error | ||
$("body").addClass("has-join-popup") | ||
$("#join-video-popupmodal").removeAttr("hidden"); | ||
} else if (jqXHR.responseText === 'missing_configuration'){ | ||
// handle other errors | ||
$("body").addClass("has-join-popup") | ||
$("#join-video-popupmodal-missing-config").removeAttr("hidden"); | ||
|
||
} | ||
} | ||
}); | ||
}); | ||
$('#join-online-close-button').click(function() { | ||
$('#join-video-popupmodal').attr('hidden', 'true'); | ||
$("body").removeClass("has-join-popup") | ||
}); | ||
$('#join-online-close-button-missing-config').click(function() { | ||
$('#join-video-popupmodal-missing-config').attr('hidden', 'true'); | ||
$("body").removeClass("has-join-popup") | ||
}); | ||
}) | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue (complexity): Consider refactoring the URL field definitions to reduce redundancy and improve maintainability.
The new code introduces some complexity and redundancy by adding a
video_link
field that is very similar to the existingticket_link
field. This can lead to maintenance issues and makes the form definition longer and harder to read. To improve maintainability and readability, consider refactoring the code to use a common method for defining URL fields. Here's an example:This refactoring reduces redundancy and makes the code easier to maintain.