Changeset 1604 in main for branches


Ignore:
Timestamp:
09/03/12 10:23:53 (7 years ago)
Author:
pcosquer
Message:

branch 1.1: merge commit [1603] from trunk

Location:
branches/1.1
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

    • Property svn:mergeinfo changed
      /trunkmerged: 1603
  • branches/1.1/docs/en/admin/applications/document3D/index.rst

    r1543 r1604  
    2727``'openPLM.apps.document3D'`` to the list of installed applications 
    2828(:const:`INSTALLED_APPS`). 
    29  
    30 The following line ``"openPLM.document3d.handle_step_file": {"queue": "step"},`` must 
    31 also be added to the :const:`CELERY_ROUTES` variable. 
    3229 
    3330You must also create a directory in media: 
  • branches/1.1/docs/en/devel/applications/document3D

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/1.1/docs/fr/admin/applications/document3D/index.rst

    r1493 r1604  
    2525activé dans le fichier settings :  
    2626ajouter ``'openPLM.apps.document3D'`` à la liste des applications installées (:const:`INSTALLED_APPS`). 
    27  
    28 La ligne suivante ``"openPLM.document3d.handle_step_file": {"queue": "step"},`` doit être rajouté dans la variable :const:`CELERY_ROUTES`. 
    2927 
    3028Enfin, il est nécessaire de crée un répertoire dans le dossier media :  
  • branches/1.1/openPLM

  • branches/1.1/openPLM/settings.py

    r1552 r1604  
    122122    'openPLM.apps.office', 
    123123    # document3D requires pythonOCC, uncomment this line to enable it 
    124     # also decomment the line CELERY_ROUTES! 
    125124    # 'openPLM.apps.document3D', 
    126125) 
     
    135134    "openPLM.plmapp.mail.do_send_histories_mail" : {"queue" : "mails"}, 
    136135    "openPLM.plmapp.mail.do_send_mail" : {"queue" : "mails"}, 
    137     #XYZ: uncomment this line if you enable document3D 
    138     # "openPLM.document3d.models.handle_step_file": {"queue": "step"}, 
    139     # "openPLM.document3d.decomposer.decomposer_all": {"queue": "step"}, 
    140  
    141136} 
     137if "openPLM.apps.document3D" in INSTALLED_APPS: 
     138    CELERY_ROUTES.update({ 
     139        "openPLM.apps.document3d.models.handle_step_file": {"queue": "step"}, 
     140        "openPLM.apps.document3d.models.decomposer_all": {"queue": "step"}, 
     141    }) 
    142142 
    143143#XYZ: EMAIL settings 
Note: See TracChangeset for help on using the changeset viewer.