diff --git a/ajax.php b/ajax.php
index 2976d02..f457a7f 100644
--- a/ajax.php
+++ b/ajax.php
@@ -74,6 +74,8 @@ switch ($action) {
$job->set('name', cr_get_POST('name', 'jobName'));
$job->set('virtual_cluster', cr_get_POST('cluster'));
$job->set('workspace', cr_get_POST('workspace'));
+ $job->set('model_dir', cr_get_POST('model_dir'));
+ $job->set('output_dir', cr_get_POST('output_dir'));
$job->set('priority', cr_get_POST('priority'));
$job->set('run_before', cr_get_POST('run_before'));
$job->set('locality', cr_get_POST('locality'));
diff --git a/job.logic.php b/job.logic.php
index ad662b7..034b91b 100644
--- a/job.logic.php
+++ b/job.logic.php
@@ -36,6 +36,8 @@ function job_submit(CRObject $job)
}
$job->set('tasks', $tasks);
$job->set('workspace', $job->get('workspace'));
+ $job->set('model_dir', $job->get('model_dir'));
+ $job->set('output_dir', $job->get('output_dir'));
$job->set('group', $job->get('virtual_cluster'));
$job->set('priority', $job->getInt('priority'));
$job->set('locality', $job->getInt('locality'));
diff --git a/modals.php b/modals.php
index bad4c35..3eaa808 100755
--- a/modals.php
+++ b/modals.php
@@ -89,6 +89,18 @@
+
+
+
+
+
+
+
+
+
+
@@ -136,17 +148,6 @@
-
@@ -171,8 +172,10 @@
diff --git a/static/job.js b/static/job.js
index 20bd2a3..e7cd47c 100755
--- a/static/job.js
+++ b/static/job.js
@@ -110,6 +110,8 @@ function register_events_job() {
$("#form-job-predict-time").click(function (e) {
var name = $('#form-job-name').val();
var workspace = $('#form-job-workspace').val();
+ var model_dir = $('#form-job-model_dir').val();
+ var output_dir = $('#form-job-output_dir').val();
var cluster = $('#form-job-cluster').val();
var priority = $('#form-job-priority').val();
var run_before = $('#form-job-run-before').val();
@@ -148,6 +150,8 @@ function register_events_job() {
data: {
name: name,
workspace: workspace,
+ model_dir: model_dir,
+ output_dir: output_dir,
cluster: cluster,
priority: priority,
run_before: run_before,
@@ -246,7 +250,7 @@ function load_jobs(scope) {
$("#table-job").bootstrapTable({
url: 'service?action=job_list&who=' + scope,
responseHandler: jobResponseHandler,
- sidePagination: 'server',
+ sidePagination: 'client',
cache: true,
striped: true,
pagination: true,
@@ -393,10 +397,7 @@ var statusFormatter = function (status) {
function jobResponseHandler(res) {
if (res['errno'] === 0) {
- var tmp = {};
- tmp["total"] = res["count"];
- tmp["rows"] = res["jobs"];
- return tmp;
+ return res["jobs"];
}
$("#modal-msg-content").html(res["msg"]);
$("#modal-msg").modal('show');
diff --git a/ucenter.php b/ucenter.php
index 0d82ba3..0c72840 100755
--- a/ucenter.php
+++ b/ucenter.php
@@ -56,11 +56,11 @@ if (isset($_GET['logs'])) {
$entries = array(
array('summary', 'Summary'),
array('jobs', 'Jobs'),
- array('workspaces', 'Workspaces'),
+ array('workspaces', 'Projects'),
array('logs', 'Activities'),
array('resources', 'Admin:Resources'),
- array('agents', 'Admin:Agents'),
- array('clusters', 'Admin:Virtual Clusters'),
+ //array('agents', 'Admin:Agents'),
+ array('clusters', 'Admin:Queues'),
array('logs_all', 'Admin:Audit')
);
$visible_entries = array();