diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-02 17:17:03 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-02 17:56:27 +0200 |
| commit | ae124e26d1453eae3159056ad6f0576a8a0966a9 (patch) | |
| tree | 931f56b43f3c15940033f215ca3a3ba0b72d9cc0 /src | |
| parent | f5f952e070a4057c935218e4ff0df6a592f4c92a (diff) | |
misc changes: newline at end of file, etc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/model/util.js | 2 | ||||
| -rw-r--r-- | src/client/rz_api_backend.js | 5 | ||||
| -rw-r--r-- | src/client/view/node_info.js | 8 | ||||
| -rw-r--r-- | src/server-tests/neo4j_test_util.py | 4 | ||||
| -rw-r--r-- | src/server/db_driver.py | 4 |
5 files changed, 9 insertions, 14 deletions
diff --git a/src/client/model/util.js b/src/client/model/util.js index 85c324ee..25d419bf 100644 --- a/src/client/model/util.js +++ b/src/client/model/util.js @@ -133,4 +133,4 @@ define([ 'jquery', 'model/diff' ], function($, model_diff) { adapt_format_write_link : adapt_format_write_link, adapt_format_write_topo_diff : adapt_format_write_topo_diff, } -});
\ No newline at end of file +}); diff --git a/src/client/rz_api_backend.js b/src/client/rz_api_backend.js index 39ed282c..740304e7 100644 --- a/src/client/rz_api_backend.js +++ b/src/client/rz_api_backend.js @@ -3,11 +3,12 @@ /** * API calls designed to execute against a local backend service */ -define(['rz_config'], function(rz_config) { +define([ 'rz_config' ], function(rz_config) { function RZ_API_Backend() { - var rz_server_url = 'http://' + rz_config.rz_server_host + ':' + rz_config.rz_server_port; + var rz_server_url = 'http://' + rz_config.rz_server_host + ':' + + rz_config.rz_server_port; /** * issue rhizi server ajax call diff --git a/src/client/view/node_info.js b/src/client/view/node_info.js index 053d2b4f..6599ed8b 100644 --- a/src/client/view/node_info.js +++ b/src/client/view/node_info.js @@ -44,7 +44,7 @@ function show(d) { fields = ["#status", "#startdate", "#enddate", "#desc", "#url"], flags = visible.hasOwnProperty(d.type) ? visible[d.type] : visible._defaults, i; - + internal.edit_tab.show('node'); for (i = 0 ; i < flags.length; ++i) { @@ -68,11 +68,8 @@ function show(d) { }); $('#editdescription').val(d.type); - $('#edittype').val(d.type); - $('#editurl').val(d.url); - $('#editstatus').val(d.status); if (d.type === "third-internship-proposal") { @@ -81,8 +78,7 @@ function show(d) { } } -function hide() -{ +function hide() { internal.edit_tab.hide(); } diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py index d5aa640a..e8e48895 100644 --- a/src/server-tests/neo4j_test_util.py +++ b/src/server-tests/neo4j_test_util.py @@ -20,7 +20,7 @@ def flush_db(db_ctl): db_ctl.exec_cypher_query('match (n) optional match (n)-[r]-() delete n,r') -def gen_rand_data(db_ctl, lim_n=128, lim_r=256, prob_link_create = 0.3): +def gen_rand_data(db_ctl, lim_n=128, lim_r=256, prob_link_create=0.3): """ generate random DB data @@ -44,7 +44,7 @@ def gen_rand_data(db_ctl, lim_n=128, lim_r=256, prob_link_create = 0.3): 'with s,d', 'limit %d' % (lim_r - 1), 'where rand() < %.2f' % (prob_link_create), - 'create (s)-[:%s {l_attr_0:toInt(%d * rand())}]->(d)' % (r_label,lim_r)] + 'create (s)-[:%s {l_attr_0:toInt(%d * rand())}]->(d)' % (r_label, lim_r)] q = ' '.join(q_arr) op = dbc.DBO_cypher_query(q) diff --git a/src/server/db_driver.py b/src/server/db_driver.py index 0532e512..fea1b505 100644 --- a/src/server/db_driver.py +++ b/src/server/db_driver.py @@ -3,7 +3,6 @@ import logging from neo4j_util import Neo4JException import neo4j_util as db_util - log = logging.getLogger('rhizi') class DB_Driver_Base(): @@ -53,7 +52,7 @@ class DB_Driver_REST(DB_Driver_Base): log.debug('tx-open: id: {0}, commit-url: {1}'.format(op.tx_id, tx_commit_url)) except Exception as e: - raise Exception('failed to open transaction:' + e.message) + raise Exception('failed to open transaction: ' + e.message) def exec_statement_set(self, op): @@ -88,4 +87,3 @@ class DB_Driver_REST(DB_Driver_Base): return ret except Exception as e: raise Exception('failed to commit transaction:' + e.message) - |
