Skip to content

Commit

Permalink
Made permission editor more portable with less reliance on dom ids th…
Browse files Browse the repository at this point in the history 
…at could clash.
  • Loading branch information
@mikemintz
mikemintz committed May 11, 2013
1 parent 56f45fc commit 7107d6b
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions deme_django/cms/templates/templatetags/privacy_editor.html
View file
Expand Up @@ -41,7 +41,7 @@
}

// turning checkbox into hidden
var is_allowed_checkbox = $('<input type="hidden" id="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_is_allowed" name="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_is_allowed" class="is_allowed" value="' + is_allowed_value + '">');
var is_allowed_checkbox = $('<input type="hidden" id="newpermission{{ permission_editor_counter }}-' + permission_counter + '_is_allowed" name="newpermission{{ permission_editor_counter }}-' + permission_counter + '_is_allowed" class="is_allowed" value="' + is_allowed_value + '">');
//is_allowed_checkbox.attr('checked', is_allowed);
//is_allowed_checkbox.attr('defaultChecked', is_allowed);
wrapper.append(is_allowed_checkbox);
Expand Down Expand Up @@ -96,7 +96,7 @@

if (can_edit_permissions) {
if (ability == '') {
var ability_select = $('<select name="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_ability" class="ability">');
var ability_select = $('<select name="newpermission{{ permission_editor_counter }}-' + permission_counter + '_ability" class="ability">');
for (var i in possible_abilities) {
// check to see if already is on page
var already_set = false;
Expand All @@ -117,11 +117,11 @@
ability_wrap.append(ability_select);
wrapper.append(ability_wrap);
} else {
wrapper.append('<label for="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_is_allowed">' + friendly_name + '</label>');
wrapper.append('<input type="hidden" class="ability" name="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_ability" value="' + ability + '" />');
wrapper.append('<label for="newpermission{{ permission_editor_counter }}-' + permission_counter + '_is_allowed">' + friendly_name + '</label>');
wrapper.append('<input type="hidden" class="ability" name="newpermission{{ permission_editor_counter }}-' + permission_counter + '_ability" value="' + ability + '" />');
}
wrapper.append('<input type="hidden" name="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_permission_type" value="' + permission_type + '" />');
wrapper.append('<input type="hidden" name="newpermission_{{ permission_editor_counter }}_' + permission_counter + '_agent_or_collection_id" value="' + agent_or_collection_id + '" />');
wrapper.append('<input type="hidden" name="newpermission{{ permission_editor_counter }}-' + permission_counter + '_permission_type" value="' + permission_type + '" />');
wrapper.append('<input type="hidden" name="newpermission{{ permission_editor_counter }}-' + permission_counter + '_agent_or_collection_id" value="' + agent_or_collection_id + '" />');

if (is_allowed===true) {
plus.addClass('active');
Expand Down Expand Up @@ -228,7 +228,7 @@
$('#permission_table tbody').append(rows[i]);
}

$('#new_agent_dialog').dialog({
$('#new_agent_dialog_{{permission_editor_counter}}').dialog({
autoOpen: false,
close: function(event, ui){
$('input[name="new_agent"]').val('');
Expand All @@ -246,7 +246,7 @@
},
});

$('#new_collection_dialog').dialog({
$('#new_collection_dialog_{{permission_editor_counter}}').dialog({
autoOpen: false,
close: function(event, ui){
$('input[name="new_collection"]').val('');
Expand All @@ -265,7 +265,7 @@
});

if (can_edit_permissions) {
$('#agent_and_collection_select_div').show();
$('#agent_and_collection_select_div_{{permission_editor_counter}}').show();
}
}

Expand All @@ -283,17 +283,17 @@
</tbody>
</table>

<div id="new_agent_dialog" style="display: none;">
<div id="new_agent_dialog_{{permission_editor_counter}}" style="display: none;">
Name of the user: {{new_agent_select_widget}}
</div>

<div id="new_collection_dialog" style="display: none;">
<div id="new_collection_dialog_{{permission_editor_counter}}" style="display: none;">
Name of the group: {{new_collection_select_widget}}
</div>

<div style="display: none;" id="agent_and_collection_select_div">
<a href="#" class="img_link" onclick="$('#new_agent_dialog').dialog('open'); return false;"><img src="{{agent_img_url}}" /> <span>Assign a Permission to a User</span></a>
<a href="#" class="img_link" onclick="$('#new_collection_dialog').dialog('open'); return false;"><img src="{{collection_img_url}}" /> <span>Assign a Permission to a Group of Users</span></a>
<div style="display: none;" id="agent_and_collection_select_div_{{permission_editor_counter}}">
<a href="#" class="img_link" onclick="$('#new_agent_dialog_{{permission_editor_counter}}').dialog('open'); return false;"><img src="{{agent_img_url}}" /> <span>Assign a Permission to a User</span></a>
<a href="#" class="img_link" onclick="$('#new_collection_dialog_{{permission_editor_counter}}').dialog('open'); return false;"><img src="{{collection_img_url}}" /> <span>Assign a Permission to a Group of Users</span></a>
</div>
<div style="margin-top: 10px;">
Having trouble with permissions? Try reading the <a href="{{permissions_help_url}}">guide to using Permissions</a>
Expand Down

0 comments on commit 7107d6b

Please sign in to comment.