put context variables in a single object
authorymh <ymh.work@gmail.com>
Wed, 04 Sep 2013 15:18:22 +0200
changeset 33 945b144d68c1
parent 32 f625ad551908
child 34 cfc090f440d0
put context variables in a single object
src/p4l/static/p4l/js/p4l.js
src/p4l/templates/p4l/record_update_form.html
src/p4l/views.py
--- a/src/p4l/static/p4l/js/p4l.js	Wed Sep 04 15:01:50 2013 +0200
+++ b/src/p4l/static/p4l/js/p4l.js	Wed Sep 04 15:18:22 2013 +0200
@@ -3,12 +3,12 @@
 
 var app = angular.module("recordApp", ['ngResource'])
 
-app.service("Api", function($resource) {
-    this.record = $resource(record_api_url);
+app.service("Api", function($resource, context) {
+    this.record = $resource(context.urls.record_api);
 });
 
-app.controller("RecordCtrl", function($scope, Api){
-    $scope.record = Api.record.get({recordId: record_id});
+app.controller("RecordCtrl", function($scope, Api, context){
+    $scope.record = Api.record.get({recordId: context.record_id});
 });
 
 app.config(['$routeProvider', function($routeProvider) {
--- a/src/p4l/templates/p4l/record_update_form.html	Wed Sep 04 15:01:50 2013 +0200
+++ b/src/p4l/templates/p4l/record_update_form.html	Wed Sep 04 15:18:22 2013 +0200
@@ -5,13 +5,18 @@
 {% block page_title %}{% trans 'Record' %} {{ params.identifier }} - {% trans 'View' %}{% endblock %}
 
 {% block js_page %}
-<script type="text/javascript">
-    var record_id = "{{id}}";
-    var record_api_url = "{% url 'record-detail' identifier=':recordId' %}".replace("\%3A",":"); 
-</script>
 <script type="text/javascript" src="{% static 'p4l/lib/angular/angular.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'p4l/lib/angular/angular-resource.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'p4l/js/p4l.js' %}"></script>
+<script type="text/javascript">
+    angular.module("recordApp")
+        .value('context', {
+            record_id: "{{id}}",
+            urls: {
+                record_api: "{% url 'record-detail' identifier=':recordId' %}".replace("\%3A",":")
+            }
+        });
+</script>
 {% endblock %}
 
 {% block content %}
--- a/src/p4l/views.py	Wed Sep 04 15:01:50 2013 +0200
+++ b/src/p4l/views.py	Wed Sep 04 15:18:22 2013 +0200
@@ -9,7 +9,7 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
-from django.views.generic import ListView, DetailView, TemplateView, UpdateView
+from django.views.generic import ListView, DetailView, TemplateView
 from p4l.forms import RecordFilterForm
 from p4l.models import Record
 from p4l.utils import get_labels_for_uris
@@ -108,14 +108,7 @@
         
         return context
 
-
 class RecordEditView(TemplateView):
     http_method_names = ['get']
     template_name = 'p4l/record_update_form.html'
 
-# class RecordEditView(UpdateView):
-#     model = Record
-#     template_name_suffix = '_update_form'
-#     slug_field = "identifier"
-#     slug_url_kwarg = "id"
-