esdrt.content 1.74.6__zip → 1.75.1__zip

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esdrt.content
-Version: 1.74.6
+Version: 1.75.1
 Summary: Content-types for ESD Review Tool
 Home-page: https://github.com/eea/esdrt.content/
 Author: Mikel Larreategi
@@ -37,6 +37,16 @@ Review Tool
 Changelog
 =========
 
+1.75.1 (2024-12-06)
+-------------------
+- Task: #277396 - Author support in carryover and bulk import.
+  [batradav]
+
+1.75.0 (2024-12-05)
+-------------------
+- Task: #277396 - Only notify author SE.
+  [batradav]
+
 1.74.6 (2024-07-01)
 -------------------
 - Task: #272010 - ESD EMRT extract error

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/docs/HISTORY.txt

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+1.75.1 (2024-12-06)
+-------------------
+- Task: #277396 - Author support in carryover and bulk import.
+  [batradav]
+
+1.75.0 (2024-12-05)
+-------------------
+- Task: #277396 - Only notify author SE.
+  [batradav]
+
 1.74.6 (2024-07-01)
 -------------------
 - Task: #272010 - ESD EMRT extract error

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/carryover.py

@@ -13,6 +13,7 @@ from Products.CMFCore.utils import getToolByName
 import openpyxl
 from DateTime import DateTime
 from esdrt.content.roles.localrolesubscriber import grant_local_roles
+import plone.api as api
 
 LOG = getLogger("esdrt.content.carryover")
 
@@ -140,14 +141,24 @@ def reopen_with_qa(workflows, obj, actor):
     if conclusion:
         add_to_wh(wf_conclusion, conclusion, "redraft", "draft", actor)
 
+def override_owner(obj, owner):
+    if owner:
+        user = api.user.get(owner)
+        if user:
+            userid = user.getId()
+            obj.changeOwnership(user)
+            obj.setCreators([userid])
+            obj.manage_setLocalRoles(userid, ["Owner", ])
 
 def copy_direct(context, catalog, workflows, obj_from_url, row):
     source = _read_col(row, 0)
     conclusion_text = _read_col(row, 1)
     actor = _read_col(row, 2)
+    owner = _read_col(row, 3)
 
     obj = obj_from_url(source)
     ob = _copy_and_flag(context, obj)
+    override_owner(ob, owner)
 
     replace_conclusion_text(workflows, ob, conclusion_text)
     clear_and_grant_roles(ob)
@@ -161,11 +172,13 @@ def copy_complex(context, catalog, workflows, obj_from_url, row):
     older_source = _read_col(row, 1)
     conclusion_text = _read_col(row, 2)
     actor = _read_col(row, 3)
+    owner = _read_col(row, 4)
 
     obj = obj_from_url(source)
     older_obj = obj_from_url(older_source)
 
     ob = _copy_and_flag(context, obj, older_obj.getId())
+    override_owner(ob, owner)
 
     replace_conclusion_text(workflows, ob, conclusion_text)
     prepend_qa(ob, older_obj)

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/get_sample_xls.py

@@ -15,6 +15,7 @@ XLS_SAMPLE_HEADER = (
     'Inventory year', 'Gas', 'Review year', 'Fuel',
     'MS key category', 'EU key category',
     'Parameter', 'Description flags', 'Initial question text',
+    'Author override',
 )
 
 DESC = 'Description of the observation'

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/observation_import.py

@@ -1,7 +1,6 @@
 import re
 from functools import partial
 from itertools import islice
-from itertools import chain
 from operator import itemgetter
 
 from zope.component import getUtility
@@ -17,6 +16,7 @@ from plone import api
 
 import openpyxl
 
+from esdrt.content.browser.carryover import override_owner
 from esdrt.content.observation import create_comment
 from esdrt.content.question import create_question
 
@@ -26,6 +26,7 @@ PORTAL_TYPE = 'Observation'
 UNUSED_FIELDS = (
     'closing_comments', 'closing_deny_comments',
     'closing_comments_phase2', 'closing_deny_comments_phase2',
+    'author',
 )
 
 UNCOMPLETED_ERR = (
@@ -101,8 +102,13 @@ def get_constants(context):
     for idx, col in enumerate(filtered_inventory_cols, start=next_col):
         XLS_COLS[col] = partial(_read_row, idx)
 
-    # last column always the initial Q&A question
-    XLS_COLS['question'] = partial(_read_row, idx + 1)
+    # 2nd to last column always the initial Q&A question
+    idx_qa_text = idx + 1
+    XLS_COLS['question'] = partial(_read_row, idx_qa_text)
+
+    # last column is the Author override (optional)
+    idx_author = idx_qa_text + 1
+    XLS_COLS['author'] = partial(_read_row, idx_author)
 
     return XLS_COLS
 
@@ -256,6 +262,11 @@ class Entry(object):
         if val is not None:
             return val.strip()
 
+    @property
+    def author(self):
+        value = self.constants['author'](self.row)
+        return value if value else None
+
     def get_fields(self):
         fields = self.constants.keys()
         return {
@@ -302,6 +313,9 @@ def _create_observation(entry, context, request, portal_type, obj):
         **fields
     )
 
+    # change ownership if given
+    override_owner(content, entry.author)
+
     question_text = entry.question
     if question_text:
         question = create_question(content)

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/statisticsview.py

@@ -20,7 +20,7 @@ class StatisticsView(grok.View):
     grok.require('cmf.ManagePortal')
 
     def update(self):
-        
+
         self.observations = self.get_all_observations()
         self.questions = self.get_all_questions()
 
@@ -74,7 +74,7 @@ class StatisticsView(grok.View):
         return step
 
     def _generic_getter(self, objs, key, value, columns=[], filter_fun=None):
-        
+
         """
          Generic function to get items for later rendering.
          Parameters:
@@ -258,7 +258,7 @@ class DownloadStatisticsView(grok.View):
         return step
 
     def _generic_getter(self, objs, key, value, columns=[], filter_fun=None):
-        
+
         """
          Generic function to get items for later rendering.
          Parameters:
@@ -359,15 +359,15 @@ class DownloadStatisticsView(grok.View):
             columns=['SRRE', 'LRQE', 'MSC', 'answered', 'conclusions', 'finalised']
         )
         for observation in observations:
-            data.append([observation['country'], 
+            data.append([observation['country'],
                 observation['SRRE'],
                 observation['LRQE'],
                 observation['MSC'],
-                observation['answered'], 
-                observation['conclusions'], 
-                observation['finalised'], 
+                observation['answered'],
+                observation['conclusions'],
+                observation['finalised'],
                 observation['sum']])
-        data.headers = ['Country', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']  
+        data.headers = ['Country', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']
 
         return data
 
@@ -379,19 +379,19 @@ class DownloadStatisticsView(grok.View):
             key='sector',
             value='status',
             columns=['SRRE', 'LRQE', 'MSC', 'answered', 'conclusions', 'finalised']
-        ) 
+        )
         for observation in observations:
-            data.append([observation['sector'], 
+            data.append([observation['sector'],
                 observation['SRRE'],
                 observation['LRQE'],
                 observation['MSC'],
-                observation['answered'], 
-                observation['conclusions'], 
-                observation['finalised'], 
+                observation['answered'],
+                observation['conclusions'],
+                observation['finalised'],
                 observation['sum']])
-        data.headers = ['Sector', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']  
+        data.headers = ['Sector', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']
 
-        return data   
+        return data
 
     def finalised_reason_per_country(self):
         data = tablib.Dataset()
@@ -401,19 +401,19 @@ class DownloadStatisticsView(grok.View):
             key='country',
             value='finalisation_reason',
             columns=['no-conclusion-yet', 'no-response-needed', 'partly-resolved', 'resolved', 'unresolved', 'significant-issue']
-        ) 
+        )
         for observation in observations:
-            data.append([observation['country'], 
+            data.append([observation['country'],
                 observation['no-conclusion-yet'],
                 observation['no-response-needed'],
                 observation['partly-resolved'],
-                observation['resolved'], 
+                observation['resolved'],
                 observation['unresolved'],
                 observation['significant-issue'],
                 observation['sum']])
-        data.headers = ['Country', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']  
+        data.headers = ['Country', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']
 
-        return data 
+        return data
 
     def finalised_reason_per_sector(self):
         data = tablib.Dataset()
@@ -425,17 +425,17 @@ class DownloadStatisticsView(grok.View):
             columns=['no-conclusion-yet', 'no-response-needed', 'partly-resolved', 'resolved', 'unresolved', 'significant-issue']
         )
         for observation in observations:
-            data.append([observation['sector'], 
+            data.append([observation['sector'],
                 observation['no-conclusion-yet'],
                 observation['no-response-needed'],
                 observation['partly-resolved'],
-                observation['resolved'], 
+                observation['resolved'],
                 observation['unresolved'],
                 observation['significant-issue'],
                 observation['sum']])
-        data.headers = ['Sector', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']  
+        data.headers = ['Sector', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']
 
-        return data                 
+        return data
 
 
     def observation_highlights_pgf(self):

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/templates/carryover.pt

@@ -13,6 +13,7 @@
                 <strong>Please note that the first row of the XLS file will be ignored.</strong>
               </li>
               <li>The <strong>userid</strong> column needs to be a valid EIONET user id. It used for the Obsevation History.</li>
+              <li>The <strong>Author override</strong> column needs to be a valid EIONET user id. <strong>If given</strong>, it will override the observation author, thus reassigning ownership of the observation.</li>
             </ul>
         </div>
     </div>
@@ -24,14 +25,27 @@
                 Observations are copied as-is, the ID will be preserved.
                 If provided, the conclusion text will replace the existing conclusion text.
             </p>
-            <table class="listing">
-              <thead><tr><th>Source observation</th><th>Conclusion text</th><th>userid</th></tr></thead>
-                <tbody><tr>
-                    <td><tal:url replace="portal_url"/>/2018/AT-1A-2018-0000</td>
-                    <td>Conclusion text that will replace the existing one.</td>
-                    <td>someuserid</td>
-                </tr></tbody>
-            </table>
+          <table class="listing">
+            <thead>
+            <tr>
+              <th>Source observation</th>
+              <th>Conclusion text</th>
+              <th>userid</th>
+              <th>Author override (userid)</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+              <td>
+                <tal:url replace="portal_url"/>
+                /2018/AT-1A-2018-0000
+              </td>
+              <td>Conclusion text that will replace the existing one.</td>
+              <td>someuserid</td>
+              <td>someuserid</td>
+            </tr>
+            </tbody>
+          </table>
 
         </div>
 
@@ -46,15 +60,32 @@
                 </ul>
                 If provided, the conclusion text will replace the existing conclusion text.
             </div>
-            <table class="listing">
-                <thead><tr><th>Source observation</th><th>Older source</th><th>Conclusion text</th><th>userid</th></tr></thead>
-                <tbody><tr>
-                    <td><tal:url replace="portal_url"/>/2018/AT-1A-2018-0000</td>
-                    <td><tal:url replace="portal_url"/>/2018/AT-1A-2017-0000</td>
-                    <td>Conclusion text that will replace the existing one.</td>
-                    <td>someuserid</td>
-                </tr></tbody>
-            </table>
+          <table class="listing">
+            <thead>
+            <tr>
+              <th>Source observation</th>
+              <th>Older source</th>
+              <th>Conclusion text</th>
+              <th>userid</th>
+              <th>Author override (userid)</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+              <td>
+                <tal:url replace="portal_url"/>
+                /2018/AT-1A-2018-0000
+              </td>
+              <td>
+                <tal:url replace="portal_url"/>
+                /2018/AT-1A-2017-0000
+              </td>
+              <td>Conclusion text that will replace the existing one.</td>
+              <td>someuserid</td>
+              <td>someuserid</td>
+            </tr>
+            </tbody>
+          </table>
 
         </div>
 

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/templates/import_observation.pt

@@ -9,9 +9,12 @@
       if your observation has multiple values, please write them one per line, as in the sample import file.
       <br/> The "Fuel" and 'Description Flags' fields can be left empty as they are not mandatory fields.
       <tal:key_categ condition="here/enable_key_category">
-      <br /> The MS/EU Key Category field can be set to 'True' if the observation belongs to this category
+      <br /> The MS/EU Key Category field can be set to 'True' if the observation belongs to this category,
       or it can be left empty if it doesn't.
       </tal:key_categ>
+      <br />
+      The last column is the <strong>Author override</strong> and requires a valid EIONET userid.
+      You can leave it empty, in which case the default is to assign yourself as the Author.
     </p>
     <p>You can download a sample import file by clicking <a href="./get_sample_xls">here</a>.</p>
 

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/templates/inboxreviewfolderview.pt

@@ -8,6 +8,12 @@
   <tal:block metal:fill-slot="javascript_head_slot">
     <script tal:attributes="src string:${portal_url}/++resource++esdrt.content/cookies.js"></script>
     <script tal:attributes="src string:${portal_url}/++resource++esdrt.content/inbox_view.js"></script>
+    <script type="text/javascript" src="++resource++orderedselect_input.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function(){
+        $(".chosen-select").chosen({width: "100%", allow_single_deselect: true});
+      })
+    </script>
   </tal:block>
   <tal:block metal:fill-slot="style_slot">
     <link rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/++resource++esdrt.content/inbox_view.css" />
@@ -49,16 +55,29 @@
 
   <div id="filters">
     <div class="row" style="padding-top:30px">
-      <div class="cell position-1 width-3 esdLabel">Free text</div>
+      <div class="cell position-1 width-9 esdLabel">Free text</div>
+      <div class="cell position-10 width-3 esdLabel">Author</div>
     </div>
     <div class="row">
       <form action="./inboxview" method="GET" tal:define="freeText request/freeText|nothing">
-        <div class="cell position-1 width-12 esdLabel">
-          <tal:params repeat="req_param python:[x for x in req_params if x[0] != 'freeText']">
+        <div class="cell position-1 width-9">
+          <tal:params repeat="req_param python:[x for x in req_params if x[0] not in ['freeText', 'obsAuthor']]">
             <input type="hidden" tal:attributes="name python:req_param[0]; value python:req_param[1]" />
           </tal:params>
           <input type="text" style="width:100%;border-radius:5px;height:21px" name="freeText" tal:attributes="value freeText" />
         </div>
+        <div class="cell position-10 width-3 esdLabel">
+           <select id="obsAuthorFilter" name="obsAuthor" class="chosen-select" data-placeholder="Select author"
+                tal:define="obsAuthor python:'';
+                            obsAuthor request/obsAuthor | obsAuthor">
+              <option></option>
+              <tal:option repeat="author python:view.get_indexed_authors()">
+                <option
+                  tal:attributes="value python:author[0]; selected python:author[0] == obsAuthor"
+                  tal:content="python:author[1]"></option>
+              </tal:option>
+            </select>
+        </div>
         <div class="cell position-14 width-1">
           <input type="submit" class="standardButton" id="btnFilter" value="Search" />
         </div>

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/browser/templates/reviewfolderview.pt

@@ -175,6 +175,16 @@
                   }
                   filter += "wfStatus=" + $('#wfStatusFilter').val();
                 }
+                // Commented so that empty value cand be used to show all available if desired.
+                // This is handled in reviewfolder.py by checking if obsAuthorFilter is None.
+                // if ($('#obsAuthorFilter').val() != ""){
+                  if (filter == ""){
+                    filter += "?";
+                  }else{
+                    filter += "&";
+                  }
+                  filter += "obsAuthor=" + $('#obsAuthorFilter').val();
+                // }
                 if ($('#crfFilter').val() != ""){
                   if (filter == ""){
                     filter += "?";
@@ -380,7 +390,8 @@
         </div>
         <div class="row" style="padding-top:20px">
           <div class="cell position-1 width-3 esdLabel" tal:condition="here/enable_steps">Step</div>
-          <div class="cell position-4 width-6 esdLabel">Workflow</div>
+          <div class="cell position-4 width-3 esdLabel">Workflow</div>
+          <div class="cell position-7 width-3 esdLabel">Author</div>
         </div>
         <div class="row">
           <div class="cell position-1 width-3" tal:condition="here/enable_steps">
@@ -394,7 +405,7 @@
                 value="step2">Step2</option>
             </select>
           </div>
-          <div class="cell position-4 width-6">
+          <div class="cell position-4 width-3">
             <select id="wfStatusFilter"  class="chosen-select" data-placeholder="Select status"
                 tal:define="wfStatus python:'';
                             wfStatus request/wfStatus | wfStatus">
@@ -415,6 +426,18 @@
                 value="finalised">Finalised</option>
             </select>
           </div>
+          <div class="cell position-7 width-3">
+           <select id="obsAuthorFilter"  class="chosen-select" data-placeholder="Select author"
+                tal:define="obsAuthor python:'';
+                            obsAuthor request/obsAuthor | obsAuthor">
+              <option></option>
+              <tal:option repeat="author python:view.get_indexed_authors()">
+                <option
+                  tal:attributes="value python:author[0]; selected python:author[0] == obsAuthor"
+                  tal:content="python:author[1]"></option>
+              </tal:option>
+            </select>
+          </div>
         </div>
         <div class="row" style="padding-top:30px">
           <div class="cell position-1 width-1">

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/notifications/utils.py

@@ -98,12 +98,20 @@ def get_users_in_context(observation, role, notification_name):
 
 
 def exclude_user_from_notification(observation, user, role, notification):
+    user_id = user.getId()
     adapted = INotificationUnsubscriptions(observation)
-    data = adapted.get_user_data(user.getId())
+    data = adapted.get_user_data(user_id)
     if not data:
         area = aq_parent(aq_inner(observation))
         if IReviewFolder.providedBy(area):
             adapted = INotificationUnsubscriptions(area)
-            data = adapted.get_user_data(user.getId())
+            data = adapted.get_user_data(user_id)
     excluded_notifications = data.get(role, [])
-    return notification in excluded_notifications
+    exclude_based_on_notification = notification in excluded_notifications
+    if exclude_based_on_notification:
+        return exclude_based_on_notification
+
+    if role in ["ReviewerPhase1", "ReviewerPhase2"] and "config_only_where_author" not in excluded_notifications:
+        owner = observation.getOwner()
+        return user_id != owner.getId() if owner else False
+

{esdrt.content-1.74.6 → esdrt_content-1.75.1}/esdrt/content/reviewfolder.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 import itertools
 import time
 from datetime import datetime
@@ -54,6 +55,7 @@ from esdrt.content.crf_code_matching import get_category_ldap_from_crf_code
 from esdrt.content.timeit import timeit
 from esdrt.content.utilities.interfaces import ISetupReviewFolderRoles
 from esdrt.content.utilities.ms_user import IUserIsMS
+from esdrt.content.utils import get_userid_name
 
 
 LOG = logging.getLogger(__name__)
@@ -85,6 +87,31 @@ LDAP_QUERY_GROUPS = (
 )
 
 
+def get_indexed_authors(context):
+    catalog = api.portal.get_tool("portal_catalog")
+    path = "/".join(context.getPhysicalPath())
+    query = {
+        "path": path,
+        "portal_type": "Observation",
+    }
+    authors = set([b.Creator for b in catalog.searchResults(query)])
+    return authors
+
+
+def get_indexed_authors_with_names(context):
+    authors = get_indexed_authors(context)
+    return [(v, get_userid_name(v)) for v in authors]
+
+
+def get_indexed_authors_for_select(context):
+    authors_with_names = get_indexed_authors_with_names(context)
+    user = api.user.get_current()
+    if (user):
+        userId = user.getId()
+        authors_with_names = [(uid, "Me ({})".format(uname)) if uid == userId else (uid, uname) for uid, uname in authors_with_names]
+    return sorted(authors_with_names, key=lambda x: float("-inf") if x[1][:2] == "Me" else x[1])
+
+
 def get_observation_phase(brain):
     result = ""
     state = brain["observation_questions_workflow"]
@@ -162,6 +189,22 @@ def _user_name(fun, self, userid):
     return (userid, time.time() // 86400)
 
 
+def redirect_for_author(context, request):
+    obsAuthor = request.get("obsAuthor", None)
+    missing_author_filter = obsAuthor is None
+    user = api.user.get_current()
+    is_user = not api.user.is_anonymous() and "Manager" not in user.getRoles()
+    if missing_author_filter and is_user:
+        user_id = user.getId()
+        if user_id in get_indexed_authors(context):
+            new_url = "%s?%s&obsAuthor=%s" % (
+                request["ACTUAL_URL"],
+                request["QUERY_STRING"],
+                user_id,
+            )
+            return request.response.redirect(new_url)
+
+
 class IReviewFolder(plone.directives.form.Schema, IImageScaleTraversable):
     """
     Folder to have all observations together
@@ -235,6 +278,17 @@ class ReviewFolder(Container):
 
 
 class ReviewFolderMixin(BrowserView):
+
+    def get_current_user_id(self):
+        result = ""
+        user = api.user.get_current()
+        if user:
+            result = user.getId()
+        return result
+
+    def get_indexed_authors(self):
+        return get_indexed_authors_for_select(self.context)
+
     @memoize
     def get_questions(self, sort_on="modified", sort_order="reverse"):
         country = self.request.form.get("country", "")
@@ -245,6 +299,7 @@ class ReviewFolderMixin(BrowserView):
         freeText = self.request.form.get("freeText", "")
         step = self.request.form.get("step", "")
         wfStatus = self.request.form.get("wfStatus", "")
+        obsAuthor = self.request.form.get("obsAuthor", "")
         crfCode = self.request.form.get("crfCode", "")
         gas = self.request.form.get("gas", self.request.form.get("gas[]", []))
         gas = gas if isinstance(gas, list) else [gas]
@@ -289,6 +344,8 @@ class ReviewFolderMixin(BrowserView):
             query["observation_step"] = step
         if wfStatus != "":
             query["observation_status"] = wfStatus
+        if obsAuthor != "":
+            query["Creator"] = obsAuthor
         if crfCode != "":
             query["crf_code"] = crfCode
         if gas != "":
@@ -503,6 +560,7 @@ class ReviewFolderBrowserView(ReviewFolderMixin):
         return table.render(table)
 
     def render(self):
+        redirect_for_author(self.context, self.request)
         sort_on = self.request.get("sort_on", "modified")
         sort_order = self.request.get("sort_order", "reverse")
         pagenumber = self.request.get("pagenumber", "1")
@@ -988,6 +1046,9 @@ class InboxReviewFolderView(BrowserView):
     def get_current_user(self):
         return api.user.get_current()
 
+    def get_indexed_authors(self):
+        return get_indexed_authors_for_select(self.context)
+
     def get_sections(self):
         is_sec = self.is_secretariat()
         viewable = [sec for sec in SECTIONS if is_sec or sec["check"](self)]
@@ -1015,6 +1076,7 @@ class InboxReviewFolderView(BrowserView):
 
     def __call__(self):
         self.rolemap_observations = {}
+        redirect_for_author(self.context, self.request)
         return super(InboxReviewFolderView, self).__call__()
 
     def batch(self, observations, b_size, b_start, orphan, b_start_str):
@@ -1027,6 +1089,7 @@ class InboxReviewFolderView(BrowserView):
 
     def get_observations(self, rolecheck=None, **kw):
         freeText = self.request.form.get("freeText", "")
+        obsAuthor = self.request.form.get("obsAuthor", "")
         catalog = api.portal.get_tool("portal_catalog")
         path = "/".join(self.context.getPhysicalPath())
         query = {
@@ -1037,6 +1100,8 @@ class InboxReviewFolderView(BrowserView):
         }
         if freeText:
             query["SearchableText"] = freeText
+        if obsAuthor != "":
+            query["Creator"] = obsAuthor
 
         query.update(kw)
         # from logging import getLogger