Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some issues with the users page

Browse source
This commit is contained in:
Duncan Sommerville 2015-09-09 17:25:40 -04:00
parent 03e23daba0
commit fb1ee2e284
4 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -103,7 +103,7 @@ var AIRTIME = (function(AIRTIME) {
}
if ($("#show_builder_table").is(":visible")) {
$('#library_display tr.lib-audio, tr.lib-pl, tr.lib-stream')
$('#library_display tr[class*="lib-"]')
.draggable(
{
helper: function () {
@ -142,7 +142,7 @@ var AIRTIME = (function(AIRTIME) {
connectToSortable: '#show_builder_table'
});
} else {
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl, tr.lib-block')
$('#library_display tr[class*="lib-"]')
.draggable(
{
helper: function () {

12
airtime_mvc/public/js/airtime/user/user.js
View file

@ -85,7 +85,8 @@ function rowCallback( nRow, aData, iDisplayIndex ){
}
function populateUserTable() {
$('#users_datatable').dataTable( {
var dt = $('#users_datatable');
dt.dataTable( {
"bProcessing": true,
"bServerSide": true,
"sAjaxSource": baseUrl+"User/get-user-data-table-info/format/json",
@ -118,7 +119,7 @@ function populateUserTable() {
"sInfoEmpty": $.i18n._("Showing 0 to 0 of 0 users"),
"sInfoFiltered": $.i18n._("(filtered from _MAX_ total users)"),
}),
"sDom": '<"H"lf<"dt-process-rel"r>>t<"F"ip>',
"sDom": '<"H"lf<"dt-process-rel"r>><"#user_list_inner_wrapper"t><"F"ip>'
});
}
@ -187,7 +188,7 @@ function assignUserRightsToUserTypes() {
});
}
function init() {
function initUserData() {
var type = $('#type');
type.live("change", function(){
@ -230,12 +231,12 @@ function init() {
$(document).ready(function() {
populateUserTable();
assignUserRightsToUserTypes();
init();
initUserData();
$('#save_user').live('click', function(){
var data = $('#user_form').serialize();
var url = baseUrl+'User/add-user';
$.post(url, {format: "json", data: data}, function(json){
if (json.valid === "true") {
$('#content').empty().append(json.html);
@ -254,5 +255,4 @@ $(document).ready(function() {
});
sizeFormElements();
});