diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-04 17:21:35 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-04 17:25:14 +0200 |
| commit | 444bf64adb3e9b698ea92090fa7681dbd5339dca (patch) | |
| tree | 3a4bc6b4a6b38dfad158ffefccf6faf4a05a5483 /src | |
| parent | f5494d9233d6f9967c614eef23dee1f29af056c9 (diff) | |
rename rhizi_api -> rz_api
Diffstat (limited to 'src')
| -rw-r--r-- | src/server-tests/test_rhizi_api.py | 2 | ||||
| -rw-r--r-- | src/server/rhizi_server.py | 4 | ||||
| -rw-r--r-- | src/server/rz_api.py (renamed from src/server/rhizi_api.py) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py index c404edba..bcc60641 100644 --- a/src/server-tests/test_rhizi_api.py +++ b/src/server-tests/test_rhizi_api.py @@ -1,6 +1,6 @@ import unittest import db_controller as dbc -import rhizi_api +import rz_api import json import logging diff --git a/src/server/rhizi_server.py b/src/server/rhizi_server.py index 855c75ed..77a1ae7e 100644 --- a/src/server/rhizi_server.py +++ b/src/server/rhizi_server.py @@ -7,7 +7,6 @@ import os import neo4j_util import argparse import db_controller as dbc -import rhizi_api import flask import crypt_util import re @@ -22,6 +21,7 @@ from flask import send_from_directory from functools import wraps from rz_mesh import init_ws_interface from rz_kernel import RZ_Kernel +import rz_api import rz_api_rest class Config(object): @@ -238,7 +238,7 @@ def init_webapp(cfg, kernel, db_ctl=None): if None == db_ctl: db_ctl = dbc.DB_Controller(cfg) - rhizi_api.db_ctl = db_ctl + rz_api.db_ctl = db_ctl rz_api_rest.db_ctl = db_ctl webapp.rz_config = cfg diff --git a/src/server/rhizi_api.py b/src/server/rz_api.py index f6a3f128..7129add0 100644 --- a/src/server/rhizi_api.py +++ b/src/server/rz_api.py @@ -174,7 +174,7 @@ def login(): # login successful session['username'] = u log.debug('login: success: user: %s' % (u)) - return redirect(url_for('index')) + return redirect('/index') if request.method == 'GET': return render_template('login.html') |
