diff --git a/CONTROL/control b/CONTROL/control index 811a034..c60fcd5 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.0.8-3 +Version: 1.0.8-4 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.8),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) diff --git a/var/mongoose/html/sched/mkdir.jim b/var/mongoose/html/sched/mkdir.jim index f445aa1..9de9af5 100755 --- a/var/mongoose/html/sched/mkdir.jim +++ b/var/mongoose/html/sched/mkdir.jim @@ -15,7 +15,7 @@ set event [rsv slot $table $slot] # "%*./:<>?\| set dir "[system mediaroot]/[\ - regsub -all {["%*\./:<>?\\|]} [$event get szFPBRecPath] "_"]" + regsub -all {["%*\./:<>?\\|]} [$event folder] "_"]" if {[file exists $dir]} { diff --git a/var/mongoose/html/sched/script.js b/var/mongoose/html/sched/script.js index 24ba545..6fa98da 100755 --- a/var/mongoose/html/sched/script.js +++ b/var/mongoose/html/sched/script.js @@ -147,16 +147,15 @@ function preparemenu(el, menu) else $('#optmenu').disableContextMenuItems('#ar'); - if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4) - { - $('#optmenu').enableContextMenuItems('#folder'); + if ($(el).attr('reckind') == 4) $('#optmenu').enableContextMenuItems('#mkfolder'); - } else - { - $('#optmenu').disableContextMenuItems('#folder'); $('#optmenu').disableContextMenuItems('#mkfolder'); - } + + if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4) + $('#optmenu').enableContextMenuItems('#folder'); + else + $('#optmenu').disableContextMenuItems('#folder'); } function menuclick(action, el, pos) @@ -164,13 +163,13 @@ function menuclick(action, el, pos) if (!$(el).is("tr")) el = $(el).closest('tr'); var sid = $(el).attr('sid'); + var table = $(el).attr('table'); //if (window.console) //console.log("Got %s, el: %o, id: %d", action, el, sid); switch (action) { case 'delete': - var table = $(el).attr('table'); if (confirm('Are you sure you want to delete this entry?')) $.get('cancel.jim?slot=' + sid + '&table=' + table, @@ -202,7 +201,7 @@ function menuclick(action, el, pos) $('#output') .empty() .show('slow') - .load('mkdir.jim?slot=' + sid, + .load('mkdir.jim?slot=' + sid + '&table=' + table, function() { $(output) .css('font-style', 'italic')