Project

General

Profile

Revision 4f9d6461

ID4f9d6461e34ff43f3181e0d17c6717303019d3f3
Parent 8cb5da40
Child 20fd4838

Added by Thomas ANDREJAK almost 15 years ago

Correction du base_url

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@299 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

apache/vigiboard
34 34
#7. [Optional] If you want to use Virtualhost apache settings. 
35 35
#Sample Virtual Host configuration would look like this:
36 36

  
37
#<Directory /usr/local/turbogears/vigiboard/apache>
38
#    Order allow,deny
39
#    Allow from all
40
#</Directory>
37
<Directory /usr/local/turbogears/vigiboard/vigiboard/public>
38
    Order allow,deny
39
    Allow from all
40
</Directory>
41 41

  
42 42
#NameVirtualHost *:81
43 43
#<VirtualHost *:81>
apache/vigiboard.wsgi
8 8
#Debian: chown -R www-data:www-data /usr/local/turbogears/vigiboard
9 9

  
10 10
import sys
11

  
11
sys.stdout = sys.stderr
12 12
#3. start of virtualenv (enabled by default).
13 13
#Please comment out until 4 if you don't use virtualenv. 
14 14
#Make sure root owns the virtualenv folder. Example:(root:root)
......
19 19
prev_sys_path = list(sys.path)
20 20

  
21 21
import site 
22
site.addsitedir('/usr/local/pythonenv/BASELINE/lib/python2.5/site-packages')
22
site.addsitedir('/usr/lib/python2.5/site-packages')
23 23

  
24 24
#Move just added item to the front of the python system path. 
25 25
#Not needed if modwsgi>=3.0. Uncomment next 6 lines.
......
49 49

  
50 50

  
51 51
#8.[Optional] If you want to test modwsgi only, uncomment section 3 in you /usr/local/turbogears/vigiboard/apache/vigiboard
52
import paste.fixture
53
app = paste.fixture.TestApp(application)
54
app.get("/")
development.ini
43 43
sqlalchemy.echo_pool = false
44 44
sqlalchemy.pool_recycle = 3600
45 45

  
46
base_url_filter.base_url=
46 47
# if you are using Mako and want to be able to reload
47 48
# the mako template from disk during the development phase
48 49
# you should say 'true' here
production.ini
33 33
#beaker.session.data_dir = %(here)s/data/sessions
34 34

  
35 35
# DB
36
sqlalchemy.url=mysql://root:tandreja@localhost:3306/vigiboard
36
#sqlalchemy.url=mysql://root:tandreja@localhost:3306/vigiboard
37 37
#echo shouldn't be used together with the logging module.
38 38
sqlalchemy.echo = false
39 39
sqlalchemy.echo_pool = false
40 40
sqlalchemy.pool_recycle = 3600
41
sqlalchemy.url=postgres://vigiboard:vigiboard@localhost/vigiboard
41 42

  
43
 
44
base_url_filter.base_url=/vigiboard
42 45
# if you are using Mako and want to be able to reload
43 46
# the mako template from disk during the development phase
44 47
# you should say 'true' here
vigiboard.egg-info/PKG-INFO
1 1
Metadata-Version: 1.0
2 2
Name: vigiboard
3
Version: 0.1dev-r0
3
Version: 0.1dev-r294
4 4
Summary: UNKNOWN
5 5
Home-page: UNKNOWN
6 6
Author: UNKNOWN
vigiboard.egg-info/SOURCES.txt
1
.gitignore
2
BeautifulSoup-3.1.0.1-py2.6.egg
1 3
MANIFEST.in
4
Makefile
2 5
README
6
development.ini
7
production.ini
8
pylint_results
9
pylint_vigiboard.py
3 10
setup.cfg
4 11
setup.py
12
test.ini
13
README/README.txt
14
README/README_Eggs_Requis.txt
15
README/HowTo/HowTo-Deploiement_de_TurboGears.odt
16
README/HowTo/HowTo-Test_Unitaire.odt
17
README/README_jquery/ui_dialog.py
18
README/README_jquery/static/css/ui.accordion.css
19
README/README_jquery/static/css/ui.all.css
20
README/README_jquery/static/css/ui.base.css
21
README/README_jquery/static/css/ui.core.css
22
README/README_jquery/static/css/ui.datepicker.css
23
README/README_jquery/static/css/ui.dialog.css
24
README/README_jquery/static/css/ui.progressbar.css
25
README/README_jquery/static/css/ui.resizable.css
26
README/README_jquery/static/css/ui.slider.css
27
README/README_jquery/static/css/ui.tabs.css
28
README/README_jquery/static/css/ui.theme.css
29
README/README_jquery/static/css/validation_form.css
30
README/README_jquery/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
31
README/README_jquery/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
32
README/README_jquery/static/css/images/ui-bg_flat_10_000000_40x100.png
33
README/README_jquery/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
34
README/README_jquery/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
35
README/README_jquery/static/css/images/ui-bg_glass_65_ffffff_1x400.png
36
README/README_jquery/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
37
README/README_jquery/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
38
README/README_jquery/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
39
README/README_jquery/static/css/images/ui-icons_222222_256x240.png
40
README/README_jquery/static/css/images/ui-icons_228ef1_256x240.png
41
README/README_jquery/static/css/images/ui-icons_ef8c08_256x240.png
42
README/README_jquery/static/css/images/ui-icons_ffd27a_256x240.png
43
README/README_jquery/static/css/images/ui-icons_ffffff_256x240.png
44
apache/README.txt
45
apache/test.wsgi
46
apache/vigiboard
47
apache/vigiboard.wsgi
48
ez_setup/README.txt
49
ez_setup/__init__.py
50
log/.keep
5 51
vigiboard/__init__.py
6 52
vigiboard/websetup.py
7 53
vigiboard.egg-info/PKG-INFO
......
13 59
vigiboard.egg-info/top_level.txt
14 60
vigiboard/config/__init__.py
15 61
vigiboard/config/app_cfg.py
62
vigiboard/config/deployment.ini_tmpl
16 63
vigiboard/config/environment.py
17 64
vigiboard/config/middleware.py
18 65
vigiboard/config/vigiboard_config.py
19 66
vigiboard/controllers/__init__.py
67
vigiboard/controllers/controller.template
20 68
vigiboard/controllers/error.py
21 69
vigiboard/controllers/root.py
22 70
vigiboard/controllers/secure.py
......
26 74
vigiboard/controllers/vigiboard_ctl/vigiboard_ctl.py
27 75
vigiboard/controllers/vigiboard_ctl/vigiboardrequest.py
28 76
vigiboard/i18n/vigiboard.pot
77
vigiboard/i18n/en/LC_MESSAGES/vigiboard.mo
78
vigiboard/i18n/en/LC_MESSAGES/vigiboard.po
29 79
vigiboard/i18n/en_US/LC_MESSAGES/vigiboard.mo
30 80
vigiboard/i18n/en_US/LC_MESSAGES/vigiboard.po
81
vigiboard/i18n/fr/LC_MESSAGES/vigiboard.mo
82
vigiboard/i18n/fr/LC_MESSAGES/vigiboard.po
31 83
vigiboard/i18n/fr_FR/LC_MESSAGES/vigiboard.mo
32 84
vigiboard/i18n/fr_FR/LC_MESSAGES/vigiboard.po
33 85
vigiboard/lib/__init__.py
......
36 88
vigiboard/lib/helpers.py
37 89
vigiboard/model/__init__.py
38 90
vigiboard/model/auth.py
91
vigiboard/model/model.template
39 92
vigiboard/model/vigiboard_bdd/__init__.py
40 93
vigiboard/model/vigiboard_bdd/eventhistory.py
41 94
vigiboard/model/vigiboard_bdd/events.py
......
86 139
vigiboard/public/images/vigiboard/icon_page_edit.png
87 140
vigiboard/public/images/vigiboard/plus.png
88 141
vigiboard/templates/__init__.py
142
vigiboard/templates/__init__.pyc
89 143
vigiboard/templates/about.html
90 144
vigiboard/templates/authentication.html
91 145
vigiboard/templates/debug.html
vigiboard/controllers/vigiboard_ctl/vigiboard_ctl.py
47 47
            redirect(request.environ.get('HTTP_REFERER'
48 48
                ).split(request.environ.get('HTTP_HOST'))[1])
49 49
        else :
50
            redirect('/vigiboard')
50
            redirect('/')
51 51

  
52 52
    @validate(validators={'page':validators.Int(not_empty=False)},
53 53
            error_handler=process_form_errors)
......
209 209
        # Vérification que l'évènement existe
210 210
        if events.num_rows() != 1 :
211 211
            flash(_('Error in DB'), 'error')
212
            redirect('/vigiboard')
212
            redirect('/')
213 213
       
214 214
        events.format_events(0, 1)
215 215
        events.format_history()
......
248 248
        
249 249
        # Vérification qu'il y a au moins 1 évènement qui correspond
250 250
        if events.num_rows() == 0 :
251
            redirect('/vigiboard')
251
            redirect('/')
252 252
       
253 253
        events.format_events(0, events.num_rows())
254 254
        events.format_history()
......
266 266
               hist_error = True
267 267
            )
268 268

  
269
    @expose('vigiboard.templates.vigiboard_update')
270 269
    @validate(validators={
271 270
        "id":validators.Regex(r'^[0-9]+(,[0-9]*)*,?$'),
272 271
        "trouble_ticket":validators.Regex(r'^[0-9]*$'),
......
299 298
        # Vérification que au moins un des identifiants existe et est éditable
300 299
        if events.num_rows() <= 0 :
301 300
            flash(_('No access to this event'), 'error')
302
            redirect('/vigiboard')
301
            redirect('/')
303 302
        
304 303
        # Modification des évènements et création d'un historique
305 304
        # pour chacun d'eux
......
323 322
                DBSession.add(history)
324 323
       
325 324
        flash(_('Updated successfully'))
326

  
327
        # Redirection vers la dernière page accédée
325
	# Redirection vers la dernière page accédée
328 326
        redirect(request.environ.get('HTTP_REFERER').split(
329
            request.environ.get('HTTP_HOST'))[1])
327
            request.environ.get('HTTP_HOST')+tg.config['base_url_filter.base_url'])[1])
330 328

  

Also available in: Unified diff