Skip to content

Commit bb2fa69

Browse files
committed
[spalenque] - #13185 * remove correct eventbrite alert on schedule and rollback previous change
1 parent d06d0db commit bb2fa69

3 files changed

Lines changed: 2 additions & 34 deletions

File tree

summit/templates/Layout/SummitAppFullSchedulePage.ss

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
</div>
1212
<div class="col-sm-2 col-log-in">
1313
<% if CurrentMember %>
14-
<% if not CurrentMember.isAttendee($Summit.ID) %>
15-
<script>
16-
$(function(){
17-
swal({
18-
type: 'info',
19-
html:
20-
'<p><%t Summit.RegistrationLine1 member_name=$CurrentMember.FullName summit_name=$Top.Summit.Title summit_registration_link=$Top.Summit.RegistrationLink %></p>'+
21-
'<p><%t Summit.RegistrationLine2 confirm_order_link=$Top.ProfileAttendeeRegistrationLink %></p>',
22-
});
23-
});
24-
</script>
25-
<% end_if %>
2614
<a title="logout" class="action btn btn-default" id="login-button" href="/Security/logout/?BackURL={$Top.Link(full)}"><i class="fa fa-sign-out" aria-hidden="true"></i>Log Out</a>
2715
<% else %>
2816
<a title="Log in to unlock features only available for registered summit attendees" class="action btn btn-default" id="login-button" href="Security/login?BackURL={$Top.Link(full)}"><i class="fa fa-user"></i>Log in</a>

summit/templates/Layout/SummitAppSchedPage.ss

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -170,26 +170,6 @@
170170
</div>
171171
</div>
172172
<% if CurrentMember %>
173-
<% if not CurrentMember.isAttendee($Summit.ID) %>
174-
<script>
175-
$(function(){
176-
var cookie = $.cookie('dismiss_not_attendee_alert_summit_{$Summit.ID}');
177-
if(typeof(cookie) == 'undefined'){
178-
swal({
179-
type: 'info',
180-
html:
181-
'<p><%t Summit.RegistrationLine1 member_name=$CurrentMember.FullName summit_name=$Top.Summit.Title summit_registration_link=$Top.Summit.RegistrationLink %></p>'+
182-
'<p><%t Summit.RegistrationLine2 confirm_order_link=$Top.ProfileAttendeeRegistrationLink %></p>',
183-
})
184-
.then(function () {
185-
// dismiss it for 10 days
186-
$.cookie('dismiss_not_attendee_alert_summit_{$Summit.ID}', '1', { expires: 10 });
187-
});
188-
189-
}
190-
});
191-
</script>
192-
<% end_if %>
193173
<div class="row">
194174
<div class="col-xs-12 logout-container">
195175
<a class="action btn btn-default" id="login-button" href="/Security/logout/?BackURL={$Top.Link}"><i class="fa fa-sign-out" aria-hidden="true"></i>Log Out</a>

summit/ui/source/js/components/schedule/event-list/event/actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ class EventActions extends Component {
6868
if (['going', 'watch', 'rsvp'].indexOf(type) >= 0 && ! current_user) {
6969
return this.showLoginAlert()
7070
}
71-
/*if (['going', 'rsvp'].indexOf(type) >= 0 && ! current_user.is_attendee) {
71+
if (['going', 'rsvp'].indexOf(type) >= 0 && ! current_user.is_attendee) {
7272
return this.showEventBriteAlert()
73-
}*/
73+
}
7474

7575
return action.click(this.props)
7676
}

0 commit comments

Comments
 (0)