lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Cleaned up Javascript Complaints from Scrutinizer (#557)

Browse Source 
* First step

* Fix flash issue
This commit is contained in:
farhatahmad
2019-06-13 10:48:06 -04:00
committed by Jesus Federico
parent cb939735bc
commit 78c9903f7c
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/admins.js
View File

@@ -32,10 +32,10 @@ $(document).on('turbolinks:load', function(){
}) })
//clear the role filter if user clicks on the x //clear the role filter if user clicks on the x
$(".clear-role").click(function(data) { $(".clear-role").click(function() {
search = new URL(location.href).searchParams.get('search') var search = new URL(location.href).searchParams.get('search')
url = window.location.pathname + "?page=1" var url = window.location.pathname + "?page=1"
if (search) { if (search) {
url += "&search=" + search url += "&search=" + search
@@ -52,8 +52,8 @@ $(document).on('turbolinks:load', function(){
$(this).ColorPickerSetColor(colour); $(this).ColorPickerSetColor(colour);
}, },
onSubmit: function(_hsb, hex, _rgb, _el) { onSubmit: function(_hsb, hex) {
$.post($("#coloring-path-regular").val(), {color: '#' + hex}).done(function(data) { $.post($("#coloring-path-regular").val(), {color: '#' + hex}).done(function() {
location.reload() location.reload()
}); });
}, },
@@ -65,8 +65,8 @@ $(document).on('turbolinks:load', function(){
$(this).ColorPickerSetColor(colour); $(this).ColorPickerSetColor(colour);
}, },
onSubmit: function(_hsb, hex, _rgb, _el) { onSubmit: function(_hsb, hex) {
$.post($("#coloring-path-lighten").val(), {color: '#' + hex}).done(function(data) { $.post($("#coloring-path-lighten").val(), {color: '#' + hex}).done(function() {
location.reload() location.reload()
}); });
}, },
@@ -78,8 +78,8 @@ $(document).on('turbolinks:load', function(){
$(this).ColorPickerSetColor(colour); $(this).ColorPickerSetColor(colour);
}, },
onSubmit: function(_hsb, hex, _rgb, _el) { onSubmit: function(_hsb, hex) {
$.post($("#coloring-path-darken").val(), {color: '#' + hex}).done(function(data) { $.post($("#coloring-path-darken").val(), {color: '#' + hex}).done(function() {
location.reload() location.reload()
}); });
}, },
@@ -108,9 +108,9 @@ function changeBrandingImage(path) {
// Filters by role // Filters by role
function filterRole(role) { function filterRole(role) {
search = new URL(location.href).searchParams.get('search') var search = new URL(location.href).searchParams.get('search')
url = window.location.pathname + "?page=1" + "&role=" + role var url = window.location.pathname + "?page=1" + "&role=" + role
if (search) { if (search) {
url += "&search=" + search url += "&search=" + search

8
app/assets/javascripts/search.js
View File

@@ -78,9 +78,9 @@ function searchPage() {
var action = $("body").data('action'); var action = $("body").data('action');
// Check if the user filtered by role // Check if the user filtered by role
role = new URL(location.href).searchParams.get('role') var role = new URL(location.href).searchParams.get('role')
url = window.location.pathname + "?page=1&search=" + search var url = window.location.pathname + "?page=1&search=" + search
if (role) { if (role) {
url += "&role=" + role url += "&role=" + role
@@ -99,9 +99,9 @@ function clearSearch() {
var controller = $("body").data('controller'); var controller = $("body").data('controller');
var action = $("body").data('action'); var action = $("body").data('action');
role = new URL(location.href).searchParams.get('role') var role = new URL(location.href).searchParams.get('role')
url = window.location.pathname + "?page=1" var url = window.location.pathname + "?page=1"
if (role) { if (role) {
url += "&role=" + role url += "&role=" + role

2
app/controllers/admins_controller.rb
View File

@@ -111,7 +111,7 @@ class AdminsController < ApplicationController
# POST /admins/branding # POST /admins/branding
def branding def branding
@settings.update_value("Branding Image", params[:url]) @settings.update_value("Branding Image", params[:url])
redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings.image") } redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
end end
# POST /admins/color # POST /admins/color