gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-09 12:36:53 +01:00
commit be640b811d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -15,11 +15,12 @@
Changes in version 4.3.24 Changes in version 4.3.24
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- fixed possible XSS attack in user substitution - fixed possible XSS attack in user substitution
- users can have than one mandatory workflow, in that case the user can select one - users can have mor than one mandatory workflow, in that case the user can select one
- completed MyDocuments page for advanced workflows - completed MyDocuments page for advanced workflows
- guest user can be automatically logged in - guest user can be automatically logged in
- get/set custom attributes by webdav - get/set custom attributes by webdav, better handling of different attribute types
- default search method can be set (fulltext, database) - default search method can be set (fulltext, database)
- further pages with content security policy turned on
- various translation updates - various translation updates
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

5
views/bootstrap/class.AttributeMgr.php
View File

@ -33,6 +33,7 @@ class SeedDMS_View_AttributeMgr extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */ function js() { /* {{{ */
$selattrdef = $this->params['selattrdef']; $selattrdef = $this->params['selattrdef'];
header('Content-Type: application/javascript');
?> ?>
$(document).ready( function() { $(document).ready( function() {
@ -45,6 +46,8 @@ $(document).ready( function() {
}); });
}); });
<?php <?php
$this->printDeleteFolderButtonJs();
$this->printDeleteDocumentButtonJs();
} /* }}} */ } /* }}} */
function info() { /* {{{ */ function info() { /* {{{ */
@ -242,6 +245,8 @@ $(document).ready( function() {
$attrdefs = $this->params['attrdefs']; $attrdefs = $this->params['attrdefs'];
$selattrdef = $this->params['selattrdef']; $selattrdef = $this->params['selattrdef'];
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("admin_tools")); $this->htmlStartPage(getMLText("admin_tools"));
$this->globalNavigation(); $this->globalNavigation();
$this->contentStart(); $this->contentStart();

6
views/bootstrap/class.Bootstrap.php
View File

@ -1543,7 +1543,8 @@ $(function() {
function printDeleteDocumentButtonJs(){ /* {{{ */ function printDeleteDocumentButtonJs(){ /* {{{ */
echo " echo "
$(document).ready(function () { $(document).ready(function () {
$('.delete-document-btn').click(function(ev) { // $('.delete-document-btn').click(function(ev) {
$('body').on('click', 'a.delete-document-btn', function(ev){
id = $(ev.currentTarget).attr('rel'); id = $(ev.currentTarget).attr('rel');
confirmmsg = $(ev.currentTarget).attr('confirmmsg'); confirmmsg = $(ev.currentTarget).attr('confirmmsg');
msg = $(ev.currentTarget).attr('msg'); msg = $(ev.currentTarget).attr('msg');
@ -1615,7 +1616,8 @@ $(function() {
function printDeleteFolderButtonJs(){ /* {{{ */ function printDeleteFolderButtonJs(){ /* {{{ */
echo " echo "
$(document).ready(function () { $(document).ready(function () {
$('.delete-folder-btn').click(function(ev) { // $('.delete-folder-btn').click(function(ev) {
$('body').on('click', 'a.delete-folder-btn', function(ev){
id = $(ev.currentTarget).attr('rel'); id = $(ev.currentTarget).attr('rel');
confirmmsg = $(ev.currentTarget).attr('confirmmsg'); confirmmsg = $(ev.currentTarget).attr('confirmmsg');
msg = $(ev.currentTarget).attr('msg'); msg = $(ev.currentTarget).attr('msg');

2
views/bootstrap/class.EditDocument.php
View File

@ -33,7 +33,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */ function js() { /* {{{ */
$strictformcheck = $this->params['strictformcheck']; $strictformcheck = $this->params['strictformcheck'];
$this->printKeywordChooserJs(); $this->printKeywordChooserJs('form1');
?> ?>
function checkForm() function checkForm()
{ {