diff options
| author | Ankita <ankita@ankita-Inspiron-N5010.(none)> | 2012-07-03 12:42:57 -0400 |
|---|---|---|
| committer | Ankita <ankita@ankita-Inspiron-N5010.(none)> | 2012-07-03 12:42:57 -0400 |
| commit | ef3793b349be5744d6ef98a034f0c009159ed85b (patch) | |
| tree | 04a873d770c330ce97eef3e78d43edb2d619d1a3 /gstudio/urls | |
| parent | e5c470536ee2d3571817b1a60f6b910f17a33f31 (diff) | |
| parent | 471a772b4d2e1430a3a119593e8694c4af2c951a (diff) | |
| download | gnowsys-ef3793b349be5744d6ef98a034f0c009159ed85b.tar.gz | |
Merge branch 'master' of https://github.com/gnowgi/gnowsys-studio
Conflicts:
django_gstudio.egg-info/PKG-INFO
django_gstudio.egg-info/requires.txt
Diffstat (limited to 'gstudio/urls')
| -rw-r--r-- | gstudio/urls/__init__.py | 3 | ||||
| -rw-r--r-- | gstudio/urls/ajaxurls.py | 5 | ||||
| -rw-r--r-- | gstudio/urls/graphs.py | 3 | ||||
| -rw-r--r-- | gstudio/urls/history.py | 6 | ||||
| -rw-r--r-- | gstudio/urls/nodetypes.py | 2 |
5 files changed, 15 insertions, 4 deletions
diff --git a/gstudio/urls/__init__.py b/gstudio/urls/__init__.py index 20ac0658..0d62d7af 100644 --- a/gstudio/urls/__init__.py +++ b/gstudio/urls/__init__.py @@ -38,4 +38,7 @@ urlpatterns = patterns( url(r'^', include('gstudio.urls.quick_nodetype')), url(r'^', include('gstudio.urls.capabilities')), url(r'^', include('gstudio.urls.nodetypes')), +url(r'^', include('gstudio.urls.chat')), + + ) diff --git a/gstudio/urls/ajaxurls.py b/gstudio/urls/ajaxurls.py index facc6036..10d1f648 100644 --- a/gstudio/urls/ajaxurls.py +++ b/gstudio/urls/ajaxurls.py @@ -25,4 +25,9 @@ urlpatterns = patterns('gstudio.views.ajaxviews', url(r'^relation/add/ajaxright/$', 'AjaxRelationright',name='ajax_relnright_views'), url(r'^relation/ajaxleft/$', 'AjaxRelationleft',name='ajax_relnleft_views'), url(r'^relation/ajaxright/$', 'AjaxRelationright',name='ajax_relnright_views'), + url(r'^contentorgadd/$', 'AjaxAddContentOrg', name='ajax_views_contentorgadd'), + url(r'^ajaxcreatehtml/$', 'AjaxCreateHtml', name='ajax_views_createhtml'), + url(r'^ajaxcreatefile/$', 'AjaxCreateFile', name='ajax_views_createfile'), + url(r'^contentadd/$', 'AjaxAddContent', name='ajax_views_contentadd'), + ) diff --git a/gstudio/urls/graphs.py b/gstudio/urls/graphs.py index 4aa8c4b5..2f8d6f23 100644 --- a/gstudio/urls/graphs.py +++ b/gstudio/urls/graphs.py @@ -28,5 +28,6 @@ urlpatterns = patterns( 'gstudio.views.graphs', url(r'^graph_json/(?P<node_id>\d+)$','graph_json', name='graph_json_d3'), url(r'^version_graph_json/(?P<ssid>\d+)$','version_graph_json', name='version_graph_d3'), - url(r'^graph/(?P<node_id>\d+)$','force_graph', name='force_graph_d3'), + url(r'^graph/(?P<node_id>\d+)$','force_graph', name='force_graph_d3'), + url(r'^graph_label/(?P<node_id>\d+)/(?P<key>[-\w]+)/$','graph_label', name='graph_label'), ) diff --git a/gstudio/urls/history.py b/gstudio/urls/history.py index 3932cd62..b2c489e3 100644 --- a/gstudio/urls/history.py +++ b/gstudio/urls/history.py @@ -3,6 +3,8 @@ from django.conf.urls.defaults import url from django.conf.urls.defaults import patterns urlpatterns = patterns('gstudio.views.history', - url(r'^viewhistory/(?P<ssid>\d+)/(?P<cnt>\d+)/$', 'history', + url(r'^viewhistory/(?P<ssid>\d+)/(?P<version_no>\d+)/$', 'history', name='gstudio_history'), - url(r'^showhistory/(?P<ssid>\d+)/$','showHistory'),) + url(r'^compare_history/(?P<ssid>\d+)/$','compare_history'), + url(r'^merge/(?P<ssid1>\d+)/(?P<ssid2>\d+)/$','merge_version'), + url(r'^revert/$','revert_version'),) diff --git a/gstudio/urls/nodetypes.py b/gstudio/urls/nodetypes.py index 9e7cd972..bfbada03 100644 --- a/gstudio/urls/nodetypes.py +++ b/gstudio/urls/nodetypes.py @@ -41,7 +41,7 @@ del nodetype_conf_year['month_format'] nodetype_conf_detail = nodetype_conf.copy() del nodetype_conf_detail['allow_empty'] -nodetype_conf_detail['queryset'] = Nodetype.published.on_site() +#nodetype_conf_detail['queryset'] = Nodetype.published.on_site() urlpatterns = patterns( |