Browse Source

- Fix several issues with the files properties in Web UI (introduced recently)

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
ed13c43e93
  1. 3
      src/httpconnection.cpp
  2. 1
      src/json.h
  3. 5
      src/webui/prop-files.html

3
src/httpconnection.cpp

@ -193,7 +193,7 @@ void HttpConnection::respond() @@ -193,7 +193,7 @@ void HttpConnection::respond()
else
list.prepend("webui");
url = ":/" + list.join("/");
qDebug("Resource URL: %s", url.toLocal8Bit().data());
//qDebug("Resource URL: %s", url.toLocal8Bit().data());
QFile file(url);
if(!file.open(QIODevice::ReadOnly))
{
@ -258,6 +258,7 @@ void HttpConnection::respondFilesPropertiesJson(QString hash) { @@ -258,6 +258,7 @@ void HttpConnection::respondFilesPropertiesJson(QString hash) {
generator.setStatusLine(200, "OK");
generator.setContentTypeByExt("js");
generator.setMessage(string);
//qDebug("JSON: %s", string.toLocal8Bit().data());
write();
}

1
src/json.h

@ -86,6 +86,7 @@ namespace json { @@ -86,6 +86,7 @@ namespace json {
return result;
}
default:
qDebug("Unknown QVariantType: %d", (int)v.type());
return "undefined";
}
}

5
src/webui/prop-files.html

@ -27,7 +27,7 @@ var createDownloadedCB = function(id, downloaded) { @@ -27,7 +27,7 @@ var createDownloadedCB = function(id, downloaded) {
if(downloaded)
CB.set('checked', 'checked');
CB.set('id', 'cbPrio'+id);
select.addEvent('change', function(e){
CB.addEvent('change', function(e){
var checked = 0;
if($defined($('cbPrio'+id).get('checked')) && $('cbPrio'+id).get('checked'))
checked = 1;
@ -66,7 +66,6 @@ var createDownloadedCB = function(id, downloaded) { @@ -66,7 +66,6 @@ var createDownloadedCB = function(id, downloaded) {
var tds = tr.getElements('td');
for(var i=0; i<row.length; i++) {
if(i==2) {
tds[i].set('html', '');
$('pbf_'+id).setValue(row[i].toFloat());
} else {
if(i==3) {
@ -95,7 +94,7 @@ var createDownloadedCB = function(id, downloaded) { @@ -95,7 +94,7 @@ var createDownloadedCB = function(id, downloaded) {
{
var td = new Element('td');
if(i==2) {
td.adopt(new ProgressBar(row[i].toFloat(), {'id', 'pbf_'+id, 'width':80}));
td.adopt(new ProgressBar(row[i].toFloat(), {'id': 'pbf_'+id, 'width':80}));
} else {
if(i == 3) {
td.adopt(createDownloadedCB(id,row[i]));

Loading…
Cancel
Save