Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix zmi #12

Merged
merged 2 commits into from
Feb 5, 2019
Merged

Fix zmi #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e113de5
fix zmi with Zope 4 (fixes https://github.com/plone/Products.CMFPlone…
pbauer Feb 5, 2019
22a3f9f
add changenote
pbauer Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Changelog
3.0 (unreleased)
----------------

- Fix zmi-patches for Zope 4.
[pbauer]

- Drop support for Python 2.6.

- Adapt tests to Zope 4.
Expand Down
15 changes: 6 additions & 9 deletions Products/ExternalEditor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

from App.ImageFile import ImageFile
from App.special_dtml import DTMLFile
from OFS.ObjectManager import ObjectManager
from ExternalEditor import ExternalEditor, EditLink
from OFS.FindSupport import FindSupport
from OFS.Folder import Folder
from App.Management import Tabs
from Products.ExternalEditor.ExternalEditor import ExternalEditor, EditLink
from OFS.ObjectManager import ObjectManager
from Products.PageTemplates.PageTemplateFile import PageTemplateFile

# Add the icon and the edit method to the misc_ namespace

Expand All @@ -31,11 +31,8 @@
Folder.externalEditLink_ = EditLink

# Monkey patch in our manage_main for Object Manager
ObjectManager.manage_main = DTMLFile('manage_main', globals())
ObjectManager.manage_main = PageTemplateFile('zpt/main', globals())

# Add our patch for the find results template
FindSupport.manage_findResult = DTMLFile('findResult', globals(),
management_view='Find')

# Add external editor icon in breadcrumbs under tabs
Tabs.manage_tabs = DTMLFile('manage_tabs', globals())
FindSupport.manage_findForm = DTMLFile('dtml/findForm', globals(),
management_view='Find')
258 changes: 258 additions & 0 deletions Products/ExternalEditor/dtml/findForm.dtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
<dtml-var manage_page_header>

<dtml-var manage_tabs>

<main class="container-fluid">

<!-- BO findResults.dtml -->
<dtml-in "('obj_ids', 'obj_metatypes', 'obj_searchterm', 'obj_expr', 'obj_mtime', 'obj_mspec', 'obj_permission', 'obj_roles', 'search_sub','searchtype')"
><dtml-else "_.hasattr(REQUEST, _['sequence-item'])"
><dtml-call "REQUEST.set(_['sequence-item'], None)"
></dtml-else
></dtml-in>

<dtml-if btn_submit>
<dtml-with "_.namespace(
results=ZopeFind(this(),
obj_ids=obj_ids,
obj_metatypes=obj_metatypes,
obj_searchterm=obj_searchterm,
obj_expr=obj_expr,
obj_mtime=obj_mtime,
obj_mspec=obj_mspec,
obj_permission=obj_permission,
obj_roles=obj_roles,
search_sub=search_sub,
REQUEST=REQUEST)
)">

<dtml-unless batch_size><dtml-call "REQUEST.set('batch_size',20)"></dtml-unless>

<dtml-if results>
<div class="alert alert-success">
Displaying items
<dtml-in name="results" size=batch_size start=query_start
><dtml-if sequence-start>&dtml-sequence-number;</dtml-if
><dtml-if sequence-end>-&dtml-sequence-number; of
<dtml-var "_.len(results)"
></dtml-if
></dtml-in>
items matching your query. You can <a href="#zmi-search-form">revise</a>
your search terms below.
</div>
<dtml-else>
<div class="alert alert-danger">
No items were found matching your query. You can
<a href="#zmi-search-form">revise</a> your search terms below.
</div>
</dtml-if>

<dtml-unless searchtype><dtml-call "REQUEST.set('searchtype', 'simple')"></dtml-unless>
<dtml-unless skey><dtml-call "REQUEST.set('skey', 'id')"></dtml-unless>
<dtml-unless rkey><dtml-call "REQUEST.set('rkey', '')"></dtml-unless>
<dtml-if "rkey == 'reverse'"><dtml-call "REQUEST.set('rkey', skey)"></dtml-if>


<dtml-if "_.len(results) > int(batch_size)">
<nav class="zmi-find-results nav row mb-2">
<div class="col-6">
<dtml-in name="results" previous size=batch_size start=query_start>
<a class="btn btn-primary float-left"
href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-previous-sequence-start-number;">
<i class="fa fa-caret-left"></i>&nbsp;&nbsp;Previous
</a>
</dtml-in>
</div>
<div class="col-6 text-right">
<dtml-in name="results" next size=batch_size start=query_start>
<a class="btn btn-primary"
href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-next-sequence-start-number;">
Next&nbsp;&nbsp;<i class="fa fa-caret-right"></i>
</a>
</dtml-in>
</div>
</nav>
</dtml-if>


<ul class="zmi-find-results list-group mb-5">
<dtml-in results size="batch_size" start="query_start" sort_expr="skey" reverse_expr="rkey">
<li class="list-group-item">
<a href="&dtml.url_quote-sequence-key;/manage_workspace">&dtml-sequence-key;
<dtml-if title>(&dtml-title;)</dtml-if>
</a>
<dtml-var expr="externalEditLink_(this())">
</li>
</dtml-in>
</ul>

</dtml-with> <!-- /namespace -->
</dtml-if> <!-- /button submit -->
<!-- EO findResults.dtml -->

<form id="zmi-search-form" action="manage_findForm" method="get" class="zmi-find">
<!--input type="hidden" name="searchtype" value="advanced" / -->
<table class="table table-borderless">
<tr class="simple-search">
<td style="width:10rem">
<label for="type" class="form-label">Find objects of type:</label>
</td>
<td style="width:*">
<div class="form-element">
<select id="type" class="form-control" name="obj_metatypes:list" size="8" multiple="multiple">
<option value="all"
<dtml-if "obj_metatypes==None">
selected="selected"
<dtml-else>
<dtml-var "( 'all' in list(obj_metatypes ) ) and 'selected=\042selected\042' or ''">
</dtml-if>
>All types</option>
<dtml-let sorted_meta_types="[]"
><dtml-in all_meta_types mapping
><dtml-call "sorted_meta_types.append(name)"
></dtml-in><dtml-call "sorted_meta_types.sort()"
><dtml-in sorted_meta_types
><option value="&dtml-sequence-item;"
<dtml-if "obj_metatypes==None">
<dtml-else>
<dtml-var "( _['sequence-item'] in list(obj_metatypes ) ) and 'selected=\042selected\042' or ''">
</dtml-if>
>&dtml-sequence-item;</option>
</dtml-in
></dtml-let>
</select>
</div>
</td>
</tr>

<tr class="simple-search">
<td>
<label for="ids" class="form-label">With ids:</label>
</td>
<td>
<input id="ids" class="form-control" type="text" name="obj_ids:tokens" value="<dtml-var "' '.join(obj_ids or [])" html_quote>" />
</td>
</tr>

<tr class="simple-search">
<td>
<label for="contain" class="form-label">Containing:</label>
</td>
<td>
<input id="contain" class="form-control" type="text" name="obj_searchterm"
value="<dtml-var "obj_searchterm and obj_searchterm or ''" html_quote>" />
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>">
<td>
<label for="expr" class="form-label">Expr:</label>
</td>
<td>
<textarea id="expr" class="form-control" name="obj_expr" rows="4" cols="30"
><dtml-var "obj_expr and obj_expr or ''"></textarea>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>">
<td>
<label for="roles" class="form-label">Where the roles:</label>
</td>
<td>
<div class="form-element">
<select id="roles" class="form-control" name="obj_roles:list" size="3" multiple="multiple">
<dtml-in valid_roles>
<dtml-if obj_roles>
<option value="&dtml-sequence-item;"<dtml-if "_['sequence-item'] in obj_roles"> selected="selected"</dtml-if>>&dtml-sequence-item;</option>
<dtml-else>
<option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
</dtml-if>
</dtml-in>
</select>
</div>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>">
<td>
<label for="perm" class="form-label">Have permission:</label>
</td>
<td>
<div class="form-element">
<select id="perm" class="form-control" name="obj_permission">
<dtml-in permission_settings mapping>
<option value="&dtml-name;"> &dtml-name;</option>
</dtml-in>
</select>
</div>
</div>
</td>
</tr>

<tr class="advanced-search-only" <dtml-if "searchtype!='advanced'">style="display:none;"</dtml-if>">
<td>
<label for="skey" class="form-label">Sort results by:</label>
</td>
<td>
<div class="form-group">
<select name="skey" id="skey" class="form-control">
<option value="meta_type">Type</option>
<option value="id">Id</option>
</select>
<div class="form-check px-4 mt-2">
<input id="rkey" class="form-check-input" type="checkbox" name="rkey" value="reverse" />
<label for="rkey" class="form-check-label">Reverse?</label>
</div>
</div>
</td>
</tr>

<tr class="simple-search">
<td>
<label for="mod" class="form-label">Modified:</label>
</td>
<td>
<div class="form-inline">
<div class="input-group px-0 col-12">
<select id="mod" name="obj_mspec" class="input-group-prepend form-control col-4 col-md-3">
<option value="&lt;"> before</option>
<option value="&gt;"> after</option>
</select>
<input class="form-control col-8 col-md-9 px-0" type="text" name="obj_mtime" />
</div>
</div>
</td>
</tr>

<tr class="simple-search">
<td>&nbsp;</td>
<td>
<div class="form-check">
<input id="thisfolder" class="form-check-input" type="radio" name="search_sub:int" value="0" />
<label for="thisfolder" class="form-check-label">Search only in this folder</label>
</div>
<div class="form-check">
<input id="subfolder" class="form-check-input" type="radio" name="search_sub:int" value="1" checked="checked" />
<label for="subfolder" class="form-check-label">Search all subfolders</label>
</div>
</td>
</tr>

<tr class="simple-search">
<td>&nbsp;</td>
<td>
<div class="zmi-controls">
<input class="btn btn-primary" type="submit" name="btn_submit" value="Find" />
<div class="btn ml-3" >
<input id="searchtype"
onclick="$('.advanced-search-only').toggle()"
class="form-check-input" type="checkbox" name="searchtype" value="advanced" <dtml-if "searchtype=='advanced'"> checked="checked"</dtml-if> />
<label for="searchtype" class="form-check-label">Advanced Search</label>
</div>
</div>
</td>
</tr>
</table>
</form>

<dtml-var manage_page_footer>
Loading