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

GRN2-xx: Fixed minor issues related to deletes (#506)

Browse Source 
* Minor fixes to improve quality

* Changed styling on login button
This commit is contained in:
farhatahmad
2019-05-07 14:53:29 -04:00
committed by Jesus Federico
parent b5aa7edd16
commit 2e064de0a9
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,12 @@ $(document).on('turbolinks:load', function(){
// show the modal with the correct form action url
$(".delete-user").click(function(data){
var uid = $(data.target).closest("tr").data("user-uid")
$("#delete-confirm").parent().attr("action", "/u/" + uid)
var url = $("body").data("relative-root")
if (!url.endsWith("/")) {
url += "/"
}
url += "u/" + uid
$("#delete-confirm").parent().attr("action", url)
})
// Change the color of the color inputs when the color is changed
@@ -66,13 +71,13 @@ $(document).on('turbolinks:load', function(){
// Only run on the admins edit user page.
if (controller == "admins" && action == "edit_user") {
$("#users").click(function(data){
$(".setting-btn").click(function(data){
var url = $("body").data("relative-root")
if (!url.endsWith("/")) {
url += "/"
}
url += "admins"
url += "admins?setting=" + data.target.id
window.location.href = url
})
}