Merge branch 'master-2522-fix-get_first_comments_or_remarks' of https://github.com/kasioumis/invenio into prod

Conflicts:
	modules/webcomment/lib/webcomment_templates.py

Author: kasioumis

modules/webcomment/lib/webcomment_config.py

@@ -66,7 +66,7 @@
         "ATLASPUBDRAFT": (
             "980__a",
             "925__b",
-            "%d %m %Y",
+            "%d %b %Y",
         )
     }
 else:

modules/webcomment/lib/webcomment_templates.py

@@ -87,6 +87,8 @@ def tmpl_get_first_comments_without_ranking(self, recID, ln, comments, nb_commen
         c_user_id = 1
         c_date_creation = 2
         c_body = 3
+        c_status = 4
+        c_nb_reports = 5
         c_id = 6
         c_body_format = 10
 
@@ -125,11 +127,21 @@ def tmpl_get_first_comments_without_ranking(self, recID, ln, comments, nb_commen
                             <td>"""
                 report_link = '%s/%s/%s/comments/report?ln=%s&amp;comid=%s' % (CFG_SITE_URL, CFG_SITE_RECORD, recID, ln, comment[c_id])
                 reply_link = '%s/%s/%s/comments/add?ln=%s&amp;comid=%s&amp;action=REPLY' % (CFG_SITE_URL, CFG_SITE_RECORD, recID, ln, comment[c_id])
-                comment_rows += self.tmpl_get_comment_without_ranking(req=None, ln=ln, nickname=messaging_link, comment_uid=comment[c_user_id],
-                                                                      date_creation=comment[c_date_creation],
-                                                                      body=comment[c_body], body_format=comment[c_body_format],
-                                                                      status='', nb_reports=0,
-                                                                      report_link=report_link, reply_link=reply_link, recID=recID)
+                comment_rows += self.tmpl_get_comment_without_ranking(
+                    req=None,
+                    ln=ln,
+                    nickname=messaging_link,
+                    comment_uid=comment[c_user_id],
+                    date_creation=comment[c_date_creation],
+                    body=comment[c_body],
+                    body_format=comment[c_body_format],
+                    status=comment[c_status],
+                    nb_reports=comment[c_nb_reports],
+                    reply_link=reply_link,
+                    report_link=report_link,
+                    recID=recID,
+                    com_id=comment[c_id]
+                )
                 comment_rows += """
                                 <br />
                                 <br />
@@ -229,11 +241,13 @@ def tmpl_get_first_comments_with_ranking(self, recID, ln, comments=None, nb_comm
         c_user_id = 1
         c_date_creation = 2
         c_body = 3
-        c_nb_votes_yes = 4
-        c_nb_votes_total = 5
-        c_star_score = 6
-        c_title = 7
-        c_id = 8
+        c_status = 4
+        c_nb_reports = 5
+        c_nb_votes_yes = 6
+        c_nb_votes_total = 7
+        c_star_score = 8
+        c_title = 9
+        c_id = 10
         c_body_format = 14
 
         warnings = self.tmpl_warnings(warnings, ln)
@@ -278,16 +292,23 @@ def tmpl_get_first_comments_with_ranking(self, recID, ln, comments=None, nb_comm
                         <tr>
                             <td>'''
                 report_link = '%s/%s/%s/reviews/report?ln=%s&amp;comid=%s' % (CFG_SITE_URL, CFG_SITE_RECORD, recID, ln, comment[c_id])
-                comment_rows += self.tmpl_get_comment_with_ranking(None, ln=ln, nickname=messaging_link,
-                                                                   comment_uid=comment[c_user_id],
-                                                                   date_creation=comment[c_date_creation],
-                                                                   body=comment[c_body],
-                                                                   body_format=comment[c_body_format],
-                                                                   status='', nb_reports=0,
-                                                                   nb_votes_total=comment[c_nb_votes_total],
-                                                                   nb_votes_yes=comment[c_nb_votes_yes],
-                                                                   star_score=comment[c_star_score],
-                                                                   title=comment[c_title], report_link=report_link, recID=recID)
+                comment_rows += self.tmpl_get_comment_with_ranking(
+                    req=None,
+                    ln=ln,
+                    nickname=messaging_link,
+                    comment_uid=comment[c_user_id],
+                    date_creation=comment[c_date_creation],
+                    body=comment[c_body],
+                    body_format=comment[c_body_format],
+                    status=comment[c_status],
+                    nb_reports=comment[c_nb_reports],
+                    nb_votes_total=comment[c_nb_votes_total],
+                    nb_votes_yes=comment[c_nb_votes_yes],
+                    star_score=comment[c_star_score],
+                    title=comment[c_title],
+                    report_link=report_link,
+                    recID=recID
+                )
                 comment_rows += '''
                               %s %s / %s<br />''' % (_("Was this review helpful?"), useful_yes % {'comid':comment[c_id]}, useful_no % {'comid':comment[c_id]})
                 comment_rows +=  '''
@@ -359,7 +380,7 @@ def tmpl_get_first_comments_with_ranking(self, recID, ln, comments=None, nb_comm
                            write_button_form)
         return out
 
-    def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_creation, body, body_format, status, nb_reports, reply_link=None, report_link=None, undelete_link=None, delete_links=None, unreport_link=None, recID=-1, com_id='', attached_files=None, collapsed_p=False):
+    def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_creation, body, body_format, status, nb_reports, reply_link=None, report_link=None, undelete_link=None, delete_links=None, unreport_link=None, recID=-1, com_id='', attached_files=None, collapsed_p=False, admin_p=False):
         """
         private function
         @param req: request object to fetch user info
@@ -416,7 +437,7 @@ def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_
         # Check if user is a comment moderator
         record_primary_collection = guess_primary_collection_of_a_record(recID)
         (auth_code, auth_msg) = acc_authorize_action(user_info, 'moderatecomments', collection=record_primary_collection)
-        if status in ['dm', 'da'] and req:
+        if status in ['dm', 'da'] and not admin_p:
             if not auth_code:
                 if status == 'dm':
                     final_body = '<div class="webcomment_deleted_comment_message">(Comment deleted by the moderator) - not visible for users<br /><br />' +\
@@ -462,7 +483,7 @@ def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_
 
         toggle_visibility_block = ''
         if not isGuestUser(user_info['uid']):
-            toggle_visibility_block = """<div class="webcomment_toggle_visibility"><a id="collapsible_ctr_%(comid)s" class="%(collapse_ctr_class)s" href="%(toggle_url)s" onclick="return toggle_visibility(this, %(comid)i);" title="%(collapse_label)s"><span style="display:none">%(collapse_label)s</span></a></div>""" % \
+            toggle_visibility_block = """<div class="webcomment_toggle_visibility"><a id="collapsible_ctr_%(comid)s" class="%(collapse_ctr_class)s" href="%(toggle_url)s" onclick="return toggle_visibility(this, %(comid)s);" title="%(collapse_label)s"><span style="display:none">%(collapse_label)s</span></a></div>""" % \
                                     {'comid': com_id,
                                      'toggle_url': create_url(CFG_SITE_URL + '/' + CFG_SITE_RECORD + '/' + str(recID) + '/comments/toggle', {'comid': com_id, 'ln': ln, 'collapse': collapsed_p and '0' or '1', 'referer': user_info['uri']}),
                                      'collapse_ctr_class': collapsed_p and 'webcomment_collapse_ctr_right' or 'webcomment_collapse_ctr_down',
@@ -476,9 +497,9 @@ def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_
         <div class="webcomment_comment_title">
             %(title)s
             <div class="webcomment_comment_date">%(date)s</div>
-            <a class="webcomment_permalink" title="Permalink to this comment" href="#C%(comid)i">¶</a>
+            <a class="webcomment_permalink" title="Permalink to this comment" href="#C%(comid)s">¶</a>
         </div>
-        <div class="collapsible_content" id="collapsible_content_%(comid)i" style="%(collapsible_content_style)s">
+        <div class="collapsible_content" id="collapsible_content_%(comid)s" style="%(collapsible_content_style)s">
             <div class="webcomment_comment_body">
             %(body)s
             </div>
@@ -502,7 +523,7 @@ def tmpl_get_comment_without_ranking(self, req, ln, nickname, comment_uid, date_
                  }
         return out
 
-    def tmpl_get_comment_with_ranking(self, req, ln, nickname, comment_uid, date_creation, body, body_format, status, nb_reports, nb_votes_total, nb_votes_yes, star_score, title, report_link=None, delete_links=None, undelete_link=None, unreport_link=None, recID=-1):
+    def tmpl_get_comment_with_ranking(self, req, ln, nickname, comment_uid, date_creation, body, body_format, status, nb_reports, nb_votes_total, nb_votes_yes, star_score, title, report_link=None, delete_links=None, undelete_link=None, unreport_link=None, recID=-1, admin_p=False):
         """
         private function
         @param req: request object to fetch user info
@@ -559,7 +580,7 @@ def tmpl_get_comment_with_ranking(self, req, ln, nickname, comment_uid, date_cre
         record_primary_collection = guess_primary_collection_of_a_record(recID)
         user_info = collect_user_info(req)
         (auth_code, auth_msg) = acc_authorize_action(user_info, 'moderatecomments', collection=record_primary_collection)
-        if status in ['dm', 'da'] and req:
+        if status in ['dm', 'da'] and not admin_p:
             if not auth_code:
                 if status == 'dm':
                     _body = '<div class="webcomment_deleted_review_message">(Review deleted by moderator) - not visible for users<br /><br />' +\
@@ -1012,7 +1033,10 @@ def tmpl_get_comments(self, req, recID, ln,
             if matching_value in get_fieldvalues(recID, matching_key):
                 deadline_value = get_fieldvalues(recID, deadline_key)
                 if deadline_value:
-                    deadline_object = datetime.strptime(deadline_value[0], deadline_value_format)
+                    try:
+                        deadline_object = datetime.strptime(deadline_value[0], deadline_value_format)
+                    except ValueError:
+                        break
                     datetime_left = deadline_object - datetime.now()
                     # People can still submit comments on the day of the
                     # deadline, so make sure to add a day here.
@@ -1364,7 +1388,7 @@ def tmpl_add_comment_form(self, recID, uid, nickname, ln, msg,
                                           enabled=CFG_WEBCOMMENT_USE_RICH_TEXT_EDITOR,
                                           file_upload_url=file_upload_url,
                                           toolbar_set = "WebComment",
-                                          custom_configurations_path='/ckeditor/cds-ckeditor-config.js',
+                                          custom_configurations_path='/ckeditor/cds-ckeditor-config.js?v=20141016',
                                           ln=ln)
         else:
             editor = get_html_text_editor(name='msg',
@@ -1484,7 +1508,7 @@ def tmpl_add_comment_form_with_ranking(self, recID, uid, nickname, ln, msg, scor
                                           enabled=CFG_WEBCOMMENT_USE_RICH_TEXT_EDITOR,
     #                                      file_upload_url=file_upload_url,
                                           toolbar_set = "WebComment",
-                                          custom_configurations_path='/ckeditor/cds-ckeditor-config.js',
+                                          custom_configurations_path='/ckeditor/cds-ckeditor-config.js?v=20141016',
                                           ln=ln)
         else:
             editor = get_html_text_editor(name='msg',
@@ -2048,7 +2072,8 @@ def tmpl_admin_comments(self, ln, uid, comID, recID, comment_data, reviews, erro
                                                                    cmt_tuple[5],#nb_votes_total
                                                                    cmt_tuple[4],#nb_votes_yes
                                                                    cmt_tuple[6],#star_score
-                                                                   cmt_tuple[7]))#title
+                                                                   cmt_tuple[7],#title
+                                                                   admin_p=True))
             else:
                 comments.append(self.tmpl_get_comment_without_ranking(None,#request object
                                                                       ln,
@@ -2065,8 +2090,8 @@ def tmpl_admin_comments(self, ln, uid, comID, recID, comment_data, reviews, erro
                                                                       None,        #delete_links
                                                                       None,        #unreport_link
                                                                       -1,          # recid
-                                                                      cmt_tuple[4] # com_id
-                                                                      ))
+                                                                      cmt_tuple[4],# com_id
+                                                                      admin_p=True))
             users.append(self.tmpl_admin_user_info(ln,
                                                    meta_data[0], #nickname
                                                    meta_data[1], #uid