seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2017-10-15 20:57:48 -05:00
parent 447edb6e68 e56e07e6d9
commit 951a271089
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/assets/javascripts/dialog/rateSessionDialog.js
View File

@ -14,6 +14,7 @@
$('#btn-rate-session-up', $scopeSelector).removeClass('selected');
$('#btn-rate-session-down', $scopeSelector).removeClass('selected');
$('#txt-rate-session-comment',"[layout-id='rate-session-dialog']").val('');
$('#btn-rate-session-send', $scopeSelector).attr("disabled","disabled");
}
function showDialog() {
@ -65,6 +66,7 @@
if ($('#btn-rate-session-down').hasClass('selected')) {
$('#btn-rate-session-down').removeClass('selected')
}
$('#btn-rate-session-send', $scopeSelector).removeAttr("disabled");
return false;
});
$('#btn-rate-session-down', $scopeSelector).click(function(evt) {
@ -76,6 +78,7 @@
if ($('#btn-rate-session-up').hasClass('selected')) {
$('#btn-rate-session-up').removeClass('selected')
}
$('#btn-rate-session-send', $scopeSelector).removeAttr("disabled");
return false;
});
$('#btn-rate-session-send', $scopeSelector).click(function(evt) {

3
web/app/controllers/api_users_controller.rb
View File

@ -655,6 +655,7 @@ class ApiUsersController < ApiController
@dump.session_id = params[:session_id]
@dump.timestamp = params[:timestamp]
@dump.description = params[:description]
#@dump.fsize = params[:fsize]
crash_date = params[:crash_date]
unless @dump.save
@ -690,6 +691,7 @@ class ApiUsersController < ApiController
body << "Download at: #{read_url}\n"
body << "User admin url: #{user.admin_url}\n"
body << "Actual Crash Date: #{crash_date}\n"
#body << "File size: #{@dump.fsize}\n"
subject = "Crash for #{@dump.client_type} - #{user.email}, on #{crash_date}"
else
@ -698,6 +700,7 @@ class ApiUsersController < ApiController
body << "Client version: #{@dump.client_version}\n"
body << "Download at: #{read_url}\n"
body << "Actual Crash Date: #{crash_date}\n"
#body << "File size: #{@dump.fsize}\n"
subject = "Crash for #{@dump.client_type} - unknown user), on #{crash_date}"
end