Change modal window size + improve get_urserlist_model function for public contents
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Mon Dec 12 10:19:04 2011 +0100
@@ -45,23 +45,7 @@
'{% trans "Cancel upload" %}',
"{% url ldt.ldt_utils.views.remove_temp_file %}",
"{% url ldt.ldt_utils.views.get_duration %}");
- });
-
- $(document).ready(function () {
-
- $("#public input").click(function () {
- if ($(this).is(':checked')) {
- $('.cellcheckbox input').attr('checked', false);
- $('.cellcheckbox input').attr('disabled', true);
- $('.perm_read, .perm_write').removeClass('pointer').removeClass('bold');
- } else {
- $('.cellcheckbox input').removeAttr('disabled');
- $('.pointer').unbind('click');
-
- activate_rw_events();
- }
- });
});
</script>
@@ -121,7 +105,9 @@
<div id="media_field_create" class="media_fields">{{ media_form.src.errors }}{{ media_form.src.label_tag }}{{ media_form.src }}</div>
</div>
</div>
+
{% include "ldt/ldt_utils/partial/permissions.html" %}
+
</div>
<div id="submitcontent" class="span-18 last">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Mon Dec 12 10:19:04 2011 +0100
@@ -13,8 +13,8 @@
<div id="elemslistcontainer" clas="span-9">
<div id="elemslistheader">
{% trans "User list" %}<br />
- <div class="searchfield rounded span-4"><input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}"/><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
- </div><br /><br />
+ <div class="searchfield span-4"><input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}"/><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+ </div><br /><br />
<select multiple="multiple" id="sharelist">
{% include "ldt/ldt_utils/partial/sharewith.html" %}
</select>
@@ -27,7 +27,7 @@
<a href="#" id="selectelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-right.gif" title="{% trans "select users" %}"></a><br />
<a href="#" id="removeelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-left.gif" title="{% trans "remove users" %}"></a>
</div>
-
+
<div id="selectedlistcontainer" class="span-9 last">
<div id="selectedlistheader" >
{% trans "Members list" %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Mon Dec 12 10:19:04 2011 +0100
@@ -1,3 +1,3 @@
-{% for res in elem_list%}
+{% for res in elem_list %}
<option value="{{ res.id }}-{{ res.type }}" >{{ res.name }}</option>
{% endfor %}
\ No newline at end of file
--- a/src/ldt/ldt/security/utils.py Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/security/utils.py Mon Dec 12 10:19:04 2011 +0100
@@ -134,6 +134,9 @@
remove_perms(read_list, old_groups, object, name)
def get_userlist_model(object, owner):
+ if hasattr(object, 'is_public') and object.is_public:
+ return [None, None]
+
users = get_users_with_perms(object, attach_perms=True)
groups = get_groups_with_perms(object, attach_perms=True)
object_name = object.__class__.__name__.lower()
--- a/src/ldt/ldt/static/ldt/js/multiselect.js Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/static/ldt/js/multiselect.js Mon Dec 12 10:19:04 2011 +0100
@@ -38,11 +38,11 @@
});
$("#removeaux").click(function () {
- var elems = get_selected_elems(sec_list);
+ var users = get_selected_elems(sec_list);
- for (var i=0; i < elems.length; i++) {
- $("option[value=" + elems[i] + "]", sec_list).css('color', 'black');
- $("input[value=" + elems[i] + "]", sec_selection).remove();
+ for (var i=0; i < users.length; i++) {
+ $("option[value=" + users[i] + "]", sec_list).css('color', 'black');
+ $("input[value=" + users[i] + "]", sec_selection).remove();
}
});
@@ -95,12 +95,12 @@
function filter_elems(first_list, sec_list) {
var selected = get_all_options(sec_list);
-
+
$("option", first_list).each(function () {
for (var i = 0; i < selected.length; i++) {
if (selected[i] == $(this).attr('value')) {
$(this).remove();
}
}
- });
+ });
}
\ No newline at end of file
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js Fri Dec 09 11:17:15 2011 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Mon Dec 12 10:19:04 2011 +0100
@@ -175,8 +175,8 @@
$('.content_link_create').nyroModal({
filters: ['iframe'],
sizes: {
- minW: 730,
- minH: 840
+ minW: 740,
+ minH: 810
},
closeOnClick:false,
callbacks: {
@@ -191,8 +191,8 @@
}
});
- nm.store.iframe.width(730);
- nm.store.iframe.height(830);
+ nm.store.iframe.width(740);
+ nm.store.iframe.height(800);
}
}
});
@@ -210,8 +210,8 @@
$('.contenttitlelink').nyroModal({
filters: ['iframe'],
sizes: {
- minW: 730,
- minH: 840
+ minW: 740,
+ minH: 810
},
closeOnClick:false,
callbacks: {
@@ -226,8 +226,8 @@
}
});
- nm.store.iframe.width(730);
- nm.store.iframe.height(830);
+ nm.store.iframe.width(740);
+ nm.store.iframe.height(800);
}
}
});
@@ -479,7 +479,7 @@
var h = $(element).innerHeight() + 10;
var w = $(element).innerWidth() + 10;
}
-
+
nm.sizes.minH = h + 10;
nm.sizes.minW = w;
iframe.height(h);