Changeset 3540

Timestamp:

08/08/06 20:22:35 (2 years ago)

Author:

clong

Message:

[per-object-permissions] AJAX interface is now working most of the time. A fair amount of work has to be done still and some tidying up of the interface. Uses YUI toolkit. Currently comes w/ the full toolkit, once debugged and working will keep only the needed js files.

Files:

• django/branches/per-object-permissions/django/contrib/admin/media/js/lib (added)
• django/branches/per-object-permissions/django/contrib/admin/media/js/lib/YahooUI (added)
• django/branches/per-object-permissions/django/contrib/admin/media/js/row_level_permission.js (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templates/admin/row_level_permission.html (modified) (4 diffs)
• django/branches/per-object-permissions/django/contrib/admin/utils.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/admin/views/main.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py (modified) (3 diffs)

django/branches/per-object-permissions/django/contrib/admin/media/js/row_level_permission.js

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-function addCallback(type, data, evt)
-{
-    if (type == 'error')
-        alert('Error when retrieving data from the server!');
-    else
-    {
-        dictData = dojo.json.evalJson(data);
-        if(dictData.result == false)
-        {
-            //outputError(dictData.text);
-            return;
-        }
-        alert("Success!");
-        //outputMsg(dictData.text);
-        //dojo.lfx.html.highlight(dojo.byId("editRLP-"+dictData.id), [184, 204, 228], 1000).play();
-    }
-}
-
-function applyButtonPressed(id)
-{
-return;
-    strArray = id.split("/");
-  dojo.io.bind({
-                 url: "/rlp/change/"+id+'/ajax/', 
-                 handler: editCallback,
-                 formNode: dojo.byId('editRLPForm-'+strArray[1])
-              });
-}
-
-function editCallback(type, data, evt)
-{
-    if (type == 'error')
-        alert('Error when retrieving data from the server!');
-    else
-    {
-        dictData = dojo.json.evalJson(data);
-        if(dictData.result == false)
-        {
-            outputError(dictData.text);
-            dojo.lfx.html.highlight(dojo.byId("editRLP-"+dictData.id), [255, 0, 0], 1000).play();
-            alert("Error");
-            return;
-        }
-        outputMessage(dictData.text);
-        dojo.lfx.html.highlight(dojo.byId("editRLP-"+dictData.id), [184, 204, 228], 1000).play();
-    }
-}
-
-function deleteRLP(id)
-{
-return;
-    var confirm_ans = confirm("Are you sure?");
-    if(confirm_ans) 
-    {
-        dojo.io.bind({
-                   url: '/rlp/delete/'+id+'/ajax',
-                   handler: deleteCallback,
-                    mimetype: 'text/json'
-                });
-    }
-}
-
-function deleteCallback(type, data, evt)
-{
-    if (type == 'error')
-        alert('Error when retrieving data from the server!');
-    else
-    {
-        dictData = dojo.json.evalJson(data);
-        if(dictData.result == false)
-        {
-            //outputError(dictData.text);
-            dojo.lfx.html.highlight(dojo.byId("editRLP-"+dictData.id), [255, 0, 0], 1000).play();
-            return;
-        }
-        outputMessage(dictData.text);
-        var row = dojo.byId('editRLP-'+dictData.id);    
-        var fadeOut = dojo.lfx.fadeOut(row, 1000, null, function(n) {
-                    var table = dojo.byId('rlpTable');
-                    table.deleteRow(row.rowIndex);    
-                    });
-        dojo.lfx.html.highlight(row, [255, 0, 0], 500).play(1500);
-        fadeOut.play();
-    }
-}
-
-function copyToNew(id)
-{
-    var newForm = document.addRLPForm;
-    var form = dojo.byId("editRLPForm-"+id);
-    newForm.owner.selectedIndex = form.owner.selectedIndex;
-    newForm.perm.selectedIndex = form.perm.selectedIndex;
-    newForm.negative.checked = form.negative.checked;
-}
-
-function outputErrors(errs)
-{
-    var output = genOutput('errors', errs);
-    dojo.lfx.html.highlight(output, [240, 0, 0], 3000).play();
-}
-
-function outputMessage(messages)
-{
-    var output = genOutput('messages', messages);
-    dojo.lfx.html.highlight(output, [184, 204, 228], 3000).play();
-}
-
-function genOutput(id, str)
-{
-    var list = document.createElement("ul");
-    list.id = id;
-    var txt = document.createTextNode(str);
-    var ele = document.createElement("li");
-    ele.appendChild(txt);
-    list.appendChild(ele);
-    var output = dojo.byId('output');
-    removeChildrenFromNode(output);
-    output.appendChild(list);
-    return output;
-}
-
-
-function removeChildrenFromNode(node)
-{
-  
-        while (node.hasChildNodes())
-        {
-          node.removeChild(node.firstChild);
-        }
-}
-
-
-function init()
-{
-    for(var i=0; i<document.forms.length; i++)
-    {
-        document.forms[i].reset();
-    }
-}
-
-//dojo.addOnLoad(init);

django/branches/per-object-permissions/django/contrib/admin/templates/admin/change_form.html

@@ -68 +68 @@
-
-{% if new_rlp_form  %}
-
-
+
-{% include "admin/row_level_permission.html" %}
-</div>

django/branches/per-object-permissions/django/contrib/admin/templates/admin/row_level_permission.html

@@ -1 +1 @@
-{% load i18n admin_modify %}
-
-
+
+
+
+
+
+
-{% include_admin_script "js/row_level_permission.js" %}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<tr class="header">
-<th>
@@ -16 +46 @@
-<th>
-{% trans "Options" %}
-</th>
-</tr>
-<form id="addRLPForm" method="POST" name="addRLPForm" action="../../../auth/row_level_permission/add/{{ content_type_id }}/{{ object_id }}/" onSubmit="addButtonPressed({{ content_type_id }}, {{ object_id }}); return false;">
-<tr>
-<th colspan=4>
-{% trans "Add Permissions" %}
-</th>
-</tr>
@@ -45 +69 @@
-</td>
-</tr>
+</table>
-</form>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</th>
-</tr>
+<TBODY>
-{% if rlp_form_list %}
-{% load row_level_permission %}
-{% for o in rlp_form_list %}
-<tr id="editRLP-{{ o.rlp.id }}">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</td>
-<td>
-{{ o.form.perm }}
-</td>
-<td>
-{{ o.form.negative }}
-</td>
-<td>
-<input id="applyButton-{{ o.rlp.id }}" type="submit" value="{% trans 'Apply' %}" />
-<input id="cancelButton-{{ o.rlp.id }}" type="reset" value="{% trans 'Reset' %}"/>
-<br/>
-<a href="../../../auth/row_level_permission/{% objref o.rlp %}/delete/" onClick="deleteRLP('{% objref o.rlp %}'); return false;" class="deleteLink">{% trans 'Delete' %}</a> | 
-<a href="" onClick="copyToNew({{ o.rlp.id }}); return false;" class="copyToNewLink">{% trans 'Copy to New' %}</a>
-</td>
-</form>
-</tr>
-{% endfor %}
@@ -80 +125 @@
-</TBODY>
-</table>
+
+<table style="display: none">
+<tr id="empty_editRLP">
+<td colspan="4">
+<form id="empty_editRLPForm" method="POST" class="editRLPForm" name="empty-editRLPForm">
+<table>
+<tr>
+        <td>
+                {{ empty_rlp_form.owner }}
+        </td>
+        <td>
+                {{ empty_rlp_form.perm }}
+        </td>
+        <td>
+                {{ empty_rlp_form.negative }}
+        </td>
+        <td>
+                <input id="applyButton" type="submit" value="{% trans 'Apply' %}" />
+                <input id="cancelButton" type="reset" value="{% trans 'Reset' %}"/>
+                <br/>
+                <a class="deleteLink" >{% trans 'Delete' %}</a> | 
+                <a class="copyToNewLink">{% trans 'Copy to New' %}</a>
+        </td>   
+</tr>
+</table>
+</form>
+</td>
+</tr>
+</table>

django/branches/per-object-permissions/django/contrib/admin/utils.py

@@ -104 +104 @@
-#Based off work by Ian Holsman
-#http://svn.zyons.python-hosting.com/trunk/zilbo/common/utils/misc.py
+
+import sha
+from django.conf import settings 
+from django.contrib.contenttypes.models import ContentType
+
-def verify_objref_hash( content_type_id, object_id, hash ):
-    import sha
-    from django.conf import settings 
-    hash_match = sha.new("%s/%s" % (content_type_id, object_id) + settings.SECRET_KEY).hexdigest()
-    if hash == hash_match:
@@ -112 +115 @@
-    else:
-        return False
+
+def create_objref(object):
+    content_type_id = ContentType.objects.get_for_model( object ).id
+    object_id = object.id
+    return "%s/%d/%s" % ( content_type_id, object_id, sha.new("%s/%d" % (content_type_id, object_id) + settings.SECRET_KEY).hexdigest())

django/branches/per-object-permissions/django/contrib/admin/views/main.py

@@ -403 +403 @@
-        edit_rlp_manip = ChangeRLPManipulator(model_ct)
-        new_rlp_form = forms.FormWrapper(add_rlp_manip, rlp_new_data, rlp_errors)
+        empty_rlp_form = forms.FormWrapper(edit_rlp_manip, rlp_new_data, rlp_errors)
-        rlp_form_list = []
-        for r in rlp_list:
@@ -408 +409 @@
-            data = {'id':r.id, 'owner':owner_val, 'perm':r.permission.id, 'negative':r.negative}
-            rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data, rlp_errors), 'rlp':r})
-
+ 'empty_rlp_form':empty_rlp_form
-        c.update(rlp_context)
-    

django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py

@@ -42 +42 @@
-    ct = get_object_or_404(ContentType, pk=ct_id)
-    obj = get_object_or_404(ct.model_class(), pk=obj_id)
-
-    if not request.user.has_perm(obj._meta.app_label + '.' + obj._meta.get_change_permission()):
-        raise PermissionDenied  
@@ -52 +51 @@
-    
-    new_data = request.POST.copy()
+    
-    manip.do_html2python(new_data)
-    
@@ -72 +72 @@
-    resp_list = []
-    for rlp in rlp_list:
-
+
+
-    msg["results"]=resp_list
-    return HttpResponse(simplejson.dumps(msg), 'text/javascript')