prevent posting before acl got populated since this will disregard the default acl setting and the post will be visible to the default audience without warning. the chance that this happens is quite small while writing a post but can easily happen on eg editing photos (maybe just tick a checkbox and press submit). the acl and submit buttons are disabled by default and will be activated as soon as acl is populated.

This commit is contained in:
marijus 2014-11-08 21:55:44 +01:00
parent ec4e4b82e9
commit 862f0ff29a
6 changed files with 11 additions and 10 deletions

View file

@ -269,5 +269,6 @@ ACL.prototype.populate = function(data){
$(el).removeAttr("data-src");
});
that.update_view();
$('#dbtn-submit, #dbtn-acl').prop('disabled', false);
}

View file

@ -5,7 +5,7 @@
<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
<div id="attach-edit-perms" >
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
</button>
{{$aclselect}} {{$file.filename}}
@ -30,7 +30,7 @@
<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
<div class="clear"></div>
<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" />
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/>
</form>

View file

@ -2,12 +2,12 @@
<form action="chat" method="post" >
{{include file="field_input.tpl" field=$name}}
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" disabled="disabled">{{$permissions}}</button>
{{$acl}}
<div class="clear"></div>
<br />
<br />
<input type="submit" name="submit" value="{{$submit}}" />
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/>
</form>

View file

@ -76,7 +76,7 @@
</div>
<div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $showacl}}
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
</button>
{{/if}}
@ -85,7 +85,7 @@
<i class="icon-eye-open jot-icons" ></i>
</button>
{{/if}}
<button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$share}}</button>
</div>
<div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper">

View file

@ -68,10 +68,10 @@
<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
</div>
<div class="form-group btn-group pull-right">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
</button>
<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$edit.submit}}</button>
</div>
</form>
<div id="photo-edit-end" class="clear"></div>

View file

@ -22,10 +22,10 @@
<input id="photos-upload-choose" type="file" name="userfile" />
</div>
<div class="btn-group pull-right">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
</button>
<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$submit}}</button>
</div>
{{/if}}