summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-04 18:37:35 +0200
committerJonathan Bauer2014-06-04 18:37:35 +0200
commit52a50e0027245cc580147fe99e2fd90697b87c84 (patch)
tree85b1601e5607de0cea397d45cc52443c33f04551
parentMerge branch 'master' of git.openslx.org:openslx-ng/slx-admin (diff)
downloadslx-admin-52a50e0027245cc580147fe99e2fd90697b87c84.tar.gz
slx-admin-52a50e0027245cc580147fe99e2fd90697b87c84.tar.xz
slx-admin-52a50e0027245cc580147fe99e2fd90697b87c84.zip
remove broken error handling + href 'back' button
-rw-r--r--modules/sysconfig.inc.php3
-rw-r--r--templates/sysconfig/custom-filelist.html35
2 files changed, 16 insertions, 22 deletions
diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php
index 3be8b16f..4bfcc3f8 100644
--- a/modules/sysconfig.inc.php
+++ b/modules/sysconfig.inc.php
@@ -169,11 +169,10 @@ class Page_SysConfig extends Page
$status = Taskmanager::waitComplete($taskStatus['id']);
Taskmanager::release($taskStatus['id']);
if (!isset($status['statusCode'])) {
- //
//$this->tmError();
}
if ($status['statusCode'] != TASK_FINISHED) {
- $this->taskError($status);
+ //$this->taskError($status);
}
// Sort files for better display
$dirs = array();
diff --git a/templates/sysconfig/custom-filelist.html b/templates/sysconfig/custom-filelist.html
index fc851ff8..3d2a079b 100644
--- a/templates/sysconfig/custom-filelist.html
+++ b/templates/sysconfig/custom-filelist.html
@@ -1,21 +1,16 @@
-<form role="form" method="post" action="?do=SysConfig">
- <input type="hidden" name="modid" value="{{modid}}">
- <input type="hidden" name="token" value="{{token}}">
-
- <table class="table table-bordered table-condensed">
- {{#files}}
- <tr>
- {{#isdir}}
- <td class="fileEntry isdir" colspan="2">{{name}}</td>
- {{/isdir}}
- {{^isdir}}
- <td class="fileEntry">{{name}}</td>
- <td>{{size}}</td>
- {{/isdir}}
- </tr>
+<input type="hidden" name="modid" value="{{modid}}">
+<input type="hidden" name="token" value="{{token}}">
+<table class="table table-bordered table-condensed">
+{{#files}}
+ <tr>
+ {{#isdir}}
+ <td class="fileEntry isdir" colspan="2">{{name}}</td>
+ {{/isdir}}
+ {{^isdir}}
+ <td class="fileEntry">{{name}}</td>
+ <td>{{size}}</td>
+ {{/isdir}}
+ </tr>
{{/files}}
- </table>
- <div class="pull-left">
- <button type="submit" class="btn btn-primary" action="?do=SysConfig">Zurück &laquo;</button>
- </div>
-</form> \ No newline at end of file
+</table>
+<a class="btn btn-primary btn-sm" href="?do=SysConfig">Zurück &laquo;</a>