mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2060 from gabsource/fix/backend-exception-popup-select

Browse Source 
Fix the exception open with popup select bug
This commit is contained in:
Samuel Georges 2016-05-28 05:33:50 +10:00
commit 759d5e8e29
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/system/assets/js/eventlogs/exception-beautifier.links.js
View File

@ -37,24 +37,26 @@
open = $.oc.lang.get('eventlog.editor.open'),
cancel = $.oc.lang.get('eventlog.editor.cancel'),
popup = $(' \
<div class="modal-header"> \
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> \
<h4 class="modal-title">' + title + '</h4> \
</div> \
<div class="modal-body"> \
<p>' + description + '</p> \
<div class="form-group"> \
<label class="control-label">' + openWith + ':</label> \
<select class="form-control" name="select-exception-link-editor"></select> \
<div> \
<div class="modal-header"> \
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> \
<h4 class="modal-title">' + title + '</h4> \
</div> \
<div class="checkbox custom-checkbox"> \
<input name="checkbox" value="1" type="checkbox" id="editor-remember-choice" /> \
<label for="editor-remember-choice">' + rememberChoice + '</label> \
<div class="modal-body"> \
<p>' + description + '</p> \
<div class="form-group"> \
<label class="control-label">' + openWith + ':</label> \
<select class="form-control" name="select-exception-link-editor"></select> \
</div> \
<div class="checkbox custom-checkbox"> \
<input name="checkbox" value="1" type="checkbox" id="editor-remember-choice" /> \
<label for="editor-remember-choice">' + rememberChoice + '</label> \
</div> \
</div> \
<div class="modal-footer"> \
<button type="button" class="btn btn-primary" data-action="submit" data-dismiss="modal">' + open + '</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \
</div> \
</div> \
<div class="modal-footer"> \
<button type="button" class="btn btn-primary" data-action="submit" data-dismiss="modal">' + open + '</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \
</div>'
),
select = $('select', popup)
@ -65,7 +67,7 @@
}
}
ExceptionBeautifier.LINKER_POPUP_CONTENT = popup
ExceptionBeautifier.LINKER_POPUP_CONTENT = popup.html()
}
}