From 99d1cd679dbcd4db73b446c8c545ab99fa258a08 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 31 Mar 2011 13:33:48 +0200
Subject: [PATCH] fix instrument table edit and update

---
 telemeta/htdocs/images/plots.png              | Bin 632 -> 651 bytes
 .../templates/telemeta/instrument_edit.html   |   1 +
 .../telemeta/instrument_edit_value.html       |   1 +
 .../telemeta_default/enumeration_edit.html    |  10 +-
 .../enumeration_edit_value.html               |   7 +-
 .../telemeta_default/instrument_edit.html     |  52 ++++++++++
 .../instrument_edit_value.html                |  28 ++++++
 .../telemeta_default/mediaitem_detail.html    |   2 +-
 telemeta/urls.py                              |  23 ++++-
 telemeta/web/base.py                          |  92 +++++++++++++-----
 10 files changed, 178 insertions(+), 38 deletions(-)
 create mode 100644 telemeta/templates/telemeta/instrument_edit.html
 create mode 100644 telemeta/templates/telemeta/instrument_edit_value.html
 create mode 100644 telemeta/templates/telemeta_default/instrument_edit.html
 create mode 100644 telemeta/templates/telemeta_default/instrument_edit_value.html

diff --git a/telemeta/htdocs/images/plots.png b/telemeta/htdocs/images/plots.png
index e8504dff03eddd02e05e3ade27694471cb84f89c..311c95e1da0c26a2c720d0f455cca145882f9990 100644
GIT binary patch
delta 596
zcmV-a0;~P_1d9cbF_A+Qe*!Q`L_t(I%jMFsPg7A8$MNs)_C0*XxZpsbB!n~}B`hUH
zcNYH+S_Tc1vx)v0#uy@hh$Ffd*a!_vD`|w#4odn8@7?1-AGXDsI(x=@&-vVQ?>%D5
zs8*{vNs*cL_xJacNqO7b+d0Sdu>*VuUQbG>)oPC<)pOHmwOXwTe|(S>NqVudu@N60
z9)2Cmc>;U^%DE}7y)9`^QUI8lNz$`&x!gWFIyxR)`6=*OQUyR$bhrn&OdEoK0I$6F
z$GKeYlbJm?GXT?Hz#ZTt-~bzLz|71!C*T`UkR<OtcBe`cz?Z=L3^e<FxCSK|EQt)1
zBr_uzd%pm93%tp$e{5zlvwJLqv+jo0?h{5(NfGca>m*H6MNvetSY&y5nX|Jq8jS{K
zhI4M@pg|4Z`%!dYk*29R=Ts_{C>D#%%*@d3c3D|j!8u2x(ZG9;b9ZCzy(dW$B(b=-
zIEwcBeVlU?3I$av74rE!?RJ~f(^Ialu2@=HVtsub=Nu;|e<$4B+>j&*^YinRN+ssz
z<_N=Z6y4g|A_xK&78W=^Kc`-=)9G~R^?EqxXti2MVr^}WD2hnal-1Q$f*>G{V>+D<
z&1Q2Hot>TK_V$*8g99!vFX{LDNFoS=`!{Pgn<PoX=H@107}9FBxVX5W+wBs^@m<X@
zy1Tpk*vx*$N^#8i2n~ORbB=sIk0jzaCQVZYga7dNd%fO7Y<S&!&-L~7ANL;2>3B!~
i8d=Q<8ipbNSNsCh3>7SJWhig}0000<MNUMnLSTY@X&n0i

delta 575
zcmV-F0>J%?1^5JzF%Je}OGiWi{{a60|De66laVeLe*gz`Nliru+X5I6029O5i1Gjc
z0r*KoK~y-)wUoW8;!qTYS0;%e7c~fuorpz5unA}-h=Ya2yhb|3LaluRYhS@mtC`9|
z5U~+K&{mNUgNR^)@jqq?CtiQA4mhjJ$vWRzd!NH5Ow+`>_3ahYVzGdxX-|El(Fmd_
zwuxs+f9LZ#^7(ul0E)$8#N~3`^(~i6WHOmH%d+7wp=ZGG-=%4(RPrzkbKzUB*GQ++
zZ2)1r-Tt_IP1CM{0PsDPO8vU_T0j6GN%B5)u~;CR&0Yg7{S-y<1Qtc{#&=V`rfFXR
zVWlw)<2QgG6h(dP_xsa7j^i$&cY63x6h#35f6jpxl(IflRec$F4|Z`N0O-1oTrQ^r
z__#K(EQ`b8fX!y}^5dthl-EF(Wf2Gj5RFE$+wD-TRxz8+o&r~^)o1zV5(ELEPzVG;
zpi-%TrfDRTN!06gD2j3yX0zGA^E`Y$-w|qEme=b=B9Xv$yG5_pL$}*KZECezh{xk-
ze>579W%;zu^E?DWfWzT{s;XcZ=6L(F*$mBQ({#Jt=yW>h_xspxw>N40em^3S2nK@z
zJRT2%!62s7DI`gPEX$B2>9eOKNn$dYpjN9v*Y$_}8V-jr3<I%P42q(lTrNXZRjgL4
zlgH_F9+Qs8V-yO7x6D9}<6awm|7D*3C5uecJoc0z2+%bB7AQ^A_yY`h;_YSm;za-e
N002ovPDHLkV1lpq5RU)=

diff --git a/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html
new file mode 100644
index 00000000..a612c3f4
--- /dev/null
+++ b/telemeta/templates/telemeta/instrument_edit.html
@@ -0,0 +1 @@
+{% extends "telemeta_default/instrument_edit.html" %}
diff --git a/telemeta/templates/telemeta/instrument_edit_value.html b/telemeta/templates/telemeta/instrument_edit_value.html
new file mode 100644
index 00000000..247ec968
--- /dev/null
+++ b/telemeta/templates/telemeta/instrument_edit_value.html
@@ -0,0 +1 @@
+{% extends "telemeta_default/instrument_edit_value.html" %}
diff --git a/telemeta/templates/telemeta_default/enumeration_edit.html b/telemeta/templates/telemeta_default/enumeration_edit.html
index 01f41c77..de1a2385 100644
--- a/telemeta/templates/telemeta_default/enumeration_edit.html
+++ b/telemeta/templates/telemeta_default/enumeration_edit.html
@@ -6,7 +6,7 @@
 {% block tabcontents %}
  <h4>{% trans "Enumeration" %}: {{ enumeration_name|capfirst }}</h4>
 
- <form class="addnew" id="addenum" method="post"
+ <form class="addnew" id="_addenum" method="POST"
         action="{% url telemeta-enumeration-add enumeration_id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Add entry" %}</legend>
@@ -17,12 +17,12 @@
    <div class="buttons">
     <br />
     <a href="#" class="component_icon button icon_add"
-      onclick="document.getElementById('addenum').submit(); return false;">{% trans "Add" %}</a>
+      onclick="document.getElementById('_addenum').submit(); return false;">{% trans "Add" %}</a>
    </div>
   </fieldset>
  </form>
  {% if enumeration_values %}
- <form method="POST" id="editenum" action="{% url telemeta-enumeration-update enumeration_id %}">{% csrf_token %}
+ <form id="_updateenum" method="POST" action="{% url telemeta-enumeration-update enumeration_id %}">{% csrf_token %}
   <table class="listing">
    <thead>
     <tr><th class="sel">&nbsp;</th><th>{% trans "Value"%}</th>
@@ -31,7 +31,7 @@
    </thead><tbody>
     {% for record in enumeration_values %}
     <tr>
-     <td><input type="checkbox" name="sel" value="{{instrument.id}}" /></td>
+     <td><input type="checkbox" name="sel" value="{{record.id}}" /></td>
      <td><a href="{% url telemeta-enumeration-record-edit enumeration_id,record.id %}">
         {{record.value}}</a></td>
     </tr>
@@ -41,7 +41,7 @@
   <div class="buttons">
    <br />
    <a href="#" class="component_icon button icon_cancel"
-      onclick="document.getElementById('editenum').submit(); return false;">{% trans "Remove selected items" %}</a>
+      onclick="document.getElementById('_updateenum').submit(); return false;">{% trans "Remove selected items" %}</a>
   </div>
  </form>
  {% else %}
diff --git a/telemeta/templates/telemeta_default/enumeration_edit_value.html b/telemeta/templates/telemeta_default/enumeration_edit_value.html
index a4f1d9a2..bdaefc09 100644
--- a/telemeta/templates/telemeta_default/enumeration_edit_value.html
+++ b/telemeta/templates/telemeta_default/enumeration_edit_value.html
@@ -14,9 +14,12 @@
     <label>{% trans "Value" %}: <input type="text" name="value" value="{{enumeration_record.value}}" /></label>
 
    </div>
+   <br />
    <div class="buttons">
-    <input type="submit" name="save" value="{% trans 'Save' %}">
-    <input type="submit" name="cancel" value="{% trans 'Cancel' %}">
+        <a href="#" class="component_icon button icon_save"
+   onclick="document.getElementById('addenum').submit(); return false;">{% trans "Save" %}</a>
+        <a href="{% url telemeta-enumeration-edit enumeration_id %}"
+           class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
  </form>
diff --git a/telemeta/templates/telemeta_default/instrument_edit.html b/telemeta/templates/telemeta_default/instrument_edit.html
new file mode 100644
index 00000000..dce8389d
--- /dev/null
+++ b/telemeta/templates/telemeta_default/instrument_edit.html
@@ -0,0 +1,52 @@
+{% extends "telemeta/admin.html" %}
+{% load i18n %}
+
+{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %}
+
+{% block tabcontents %}
+ <h4>{% trans "Instruments" %}</h4>
+
+ <form class="addnew" id="_addinstru" method="POST"
+        action="{% url telemeta-instrument-add %}">{% csrf_token %}
+  <fieldset>
+   <legend>{% trans "Add entry" %}</legend>
+   <div class="field">
+    <label>{% trans "Name" %}: <input type="text" name="value"></label>
+
+   </div>
+   <div class="buttons">
+    <br />
+    <a href="#" class="component_icon button icon_add"
+      onclick="document.getElementById('_addinstru').submit(); return false;">{% trans "Add" %}</a>
+   </div>
+  </fieldset>
+ </form>
+ {% if instruments %}
+ <form id="_updateinstru" method="POST" action="{% url telemeta-instrument-update %}">{% csrf_token %}
+  <table class="listing">
+   <thead>
+    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th>
+
+    </tr>
+   </thead><tbody>
+    {% for record in instruments %}
+    <tr>
+     <td><input type="checkbox" name="sel" value="{{record.id}}" /></td>
+     <td><a href="{% url telemeta-instrument-record-edit record.id %}">
+        {{record.name}}</a></td>
+    </tr>
+    {% endfor %}
+    </tbody>
+  </table>
+  <div class="buttons">
+   <br />
+   <a href="#" class="component_icon button icon_cancel"
+      onclick="document.getElementById('_updateinstru').submit(); return false;">{% trans "Remove selected items" %}</a>
+  </div>
+ </form>
+ {% else %}
+    <p class="help">{% trans "This instrument list is empty" %}</p>
+ {% endif %}
+
+  <br style="clear: right"/>
+{% endblock %}
diff --git a/telemeta/templates/telemeta_default/instrument_edit_value.html b/telemeta/templates/telemeta_default/instrument_edit_value.html
new file mode 100644
index 00000000..2fcf7074
--- /dev/null
+++ b/telemeta/templates/telemeta_default/instrument_edit_value.html
@@ -0,0 +1,28 @@
+{% extends "telemeta/admin.html" %}
+{% load i18n %}
+
+{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %}
+
+{% block tabcontents %}
+ <h4>{% trans "Instruments" %}</h4>
+
+ <form class="mod" id="addinstru" method="post"
+    action="{% url telemeta-instrument-record-update instrument.id %}">{% csrf_token %}
+  <fieldset>
+   <legend>{% trans "Modify an entry" %}</legend>
+   <div class="field">
+    <label>{% trans "Name" %}: <input type="text" name="value" value="{{instrument.name}}" /></label>
+
+   </div>
+   <br />
+   <div class="buttons">
+        <a href="#" class="component_icon button icon_save"
+   onclick="document.getElementById('addinstru').submit(); return false;">{% trans "Save" %}</a>
+        <a href="{% url telemeta-instrument-edit %}"
+           class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+   </div>
+  </fieldset>
+ </form>
+  <br style="clear: right"/>
+
+{% endblock %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index ec42812b..7b598c39 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -102,7 +102,7 @@
                             {{v.name}}</option>
                     {% endfor %}
                 </select>
-                <input type="submit" value="Set" />
+                <input style="visibility: hidden;" type="submit" value="Set" />
             </form>
 
             <!--
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 72380f5c..19f1ff77 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -134,12 +134,27 @@ urlpatterns = patterns('',
     # administration        
     url(r'^admin/$', web_view.admin_index, name="telemeta-admin"),        
     url(r'^admin/general/$', web_view.admin_general, name="telemeta-admin-general"),        
-    url(r'^admin/enumerations/$', web_view.admin_enumerations, name="telemeta-admin-enumerations"),        
-    url(r'^admin/instruments/$', web_view.admin_instruments, name="telemeta-admin-instruments"),        
+    url(r'^admin/enumerations/$', web_view.admin_enumerations, name="telemeta-admin-enumerations"),       
     
     # instruments administration
-    url(r'^admin/instruments/(?P<instrument_id>[0-9]+)/edit/$', web_view.admin_instrument_edit, name="telemeta-admin-instruments-edit"), 
-    
+    url(r'^admin/instruments/$', 
+        web_view.edit_instrument ,
+        name="telemeta-instrument-edit"),        
+    url(r'^admin/instruments/add/$', 
+        web_view.add_to_instrument,
+        name="telemeta-instrument-add"),        
+    url(r'^admin/instruments/update/$', 
+        web_view.update_instrument,
+        name="telemeta-instrument-update"),        
+    url(r'^admin/instruments/'
+        + r'(?P<value_id>[0-9]+)/$',
+        web_view.edit_instrument_value,
+        name="telemeta-instrument-record-edit"),   
+    url(r'^admin/instruments/'
+        + r'(?P<value_id>[0-9]+)/update/$',
+        web_view.update_instrument_value, 
+        name="telemeta-instrument-record-update"),   
+        
     # enumerations administration
     url(r'^admin/enumerations/(?P<enumeration_id>[0-9a-z]+)/$', 
         web_view.edit_enumeration ,
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index cbf73aaf..779387df 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -626,6 +626,25 @@ class WebView(object):
             extra_context={'criteria': criteria, 'collections_num': collections.count(), 
                 'items_num': items.count(), 'type' : type})
 
+
+
+
+    # ADMIN
+
+    @method_decorator(permission_required('sites.change_site'))
+    def admin_index(self, request):
+        return render(request, 'telemeta/admin.html', self.__get_admin_context_vars())
+
+    @method_decorator(permission_required('sites.change_site'))
+    def admin_general(self, request):
+        return render(request, 'telemeta/admin_general.html', self.__get_admin_context_vars())
+    
+    @method_decorator(permission_required('sites.change_site'))
+    def admin_enumerations(self, request):
+        return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars())
+
+    
+    # ENUMERATIONS
     def __get_enumerations_list(self):
         from django.db.models import get_models
         models = get_models(telemeta.models)
@@ -643,29 +662,6 @@ class WebView(object):
     def __get_admin_context_vars(self):
         return {"enumerations": self.__get_enumerations_list()}
     
-    @method_decorator(permission_required('sites.change_site'))
-    def admin_index(self, request):
-        return render(request, 'telemeta/admin.html', self.__get_admin_context_vars())
-
-    @method_decorator(permission_required('sites.change_site'))
-    def admin_general(self, request):
-        return render(request, 'telemeta/admin_general.html', self.__get_admin_context_vars())
-    
-    @method_decorator(permission_required('sites.change_site'))
-    def admin_enumerations(self, request):
-        return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars())
-
-    @method_decorator(permission_required('sites.change_site'))
-    def admin_instruments(self, request):
-        instruments = Instrument.objects.all().order_by('name')
-        return render(request, 'telemeta/admin_instruments.html', {'instruments': instruments})
-
-    @method_decorator(permission_required('telemeta.change_instrument'))
-    def admin_instrument_edit(self, request, instrument_id):
-        instrument = Instrument.objects.get(pk=instrument_id)
-        vars = self.__get_admin_context_vars()
-        render(request, 'telemeta/enumeration_edit_value.html', vars)
-        
     def __get_enumeration(self, id):
         from django.db.models import get_models
         models = get_models(telemeta.models)
@@ -709,8 +705,8 @@ class WebView(object):
         enumeration  = self.__get_enumeration(enumeration_id)
         if enumeration == None:
             raise Http404
-
-        if request.POST.has_key("remove"):
+        
+        if request.method == 'POST':
             enumeration.objects.filter(id__in=request.POST.getlist('sel')).delete()
 
         return self.edit_enumeration(request, enumeration_id)
@@ -731,7 +727,7 @@ class WebView(object):
     @method_decorator(permission_required('telemeta.change_keyword'))
     def update_enumeration_value(self, request, enumeration_id, value_id):        
 
-        if request.POST.has_key("save"):
+        if request.method == 'POST':
             enumeration  = self.__get_enumeration(enumeration_id)
             if enumeration == None:
                 raise Http404
@@ -742,6 +738,50 @@ class WebView(object):
 
         return self.edit_enumeration(request, enumeration_id)
   
+  
+    
+    # INSTRUMENTS
+    @method_decorator(permission_required('telemeta.change_instrument'))
+    def edit_instrument(self, request):        
+        
+        instruments = Instrument.objects.all().order_by('name')
+        if instruments == None:
+            raise Http404
+        return render(request, 'telemeta/instrument_edit.html', {'instruments': instruments})
+
+    @method_decorator(permission_required('telemeta.add_instrument'))
+    def add_to_instrument(self, request):        
+
+        if request.method == 'POST':
+            instrument = Instrument(name=request.POST['value'])
+            instrument.save()
+
+        return self.edit_instrument(request)
+
+    @method_decorator(permission_required('telemeta.change_instrument'))
+    def update_instrument(self, request):        
+        
+        if request.method == 'POST':
+            Instrument.objects.filter(id__in=request.POST.getlist('sel')).delete()
+
+        return self.edit_instrument(request)
+
+    @method_decorator(permission_required('telemeta.change_instrument'))
+    def edit_instrument_value(self, request, value_id):        
+        instrument = Instrument.objects.get(id__exact=value_id)
+        
+        return render(request, 'telemeta/instrument_edit_value.html', {'instrument': instrument})
+
+    @method_decorator(permission_required('telemeta.change_instrument'))
+    def update_instrument_value(self, request, value_id):        
+
+        if request.method == 'POST':       
+            instrument = Instrument.objects.get(id__exact=value_id)
+            instrument.name = request.POST["value"]
+            instrument.save()
+
+        return self.edit_instrument(request)
+        
     def collection_playlist(self, request, public_id, template, mimetype):
         try:
             collection = MediaCollection.objects.get(public_id=public_id)
-- 
2.39.5