Merge pull request #586 from topcoder-platform/issues-559_1

Issues-559:Fixed Deleting comment popup, Issues-587

Author: jmgasper

vanilla/applications/vanilla/controllers/class.discussioncontroller.php

@@ -391,8 +391,8 @@ public function getNew($discussionID, $lastCommentID = 0) {
      */
     public function initialize() {
         parent::initialize();
-        $this->addDefinition('ConfirmDeleteCommentHeading', t('ConfirmDeleteCommentHeading', 'Delete Comment'));
-        $this->addDefinition('ConfirmDeleteCommentText', t('ConfirmDeleteCommentText', 'Are you sure you want to delete this comment?'));
+        $this->addDefinition('ConfirmDeleteCommentHeading', t('ConfirmDeleteCommentHeading', 'Delete'));
+        $this->addDefinition('ConfirmDeleteCommentText', t('ConfirmDeleteCommentText', 'Are you sure you want to delete this item?'));
         $this->Menu->highlightRoute('/discussions');
     }
 

vanilla/applications/vanilla/js/discussion.js

@@ -401,13 +401,42 @@ jQuery(document).ready(function($) {
         return false;
     });
 
+    var currentCommentView = gdn.urlQueryParam(window.location.href, 'view');
+    var deliveryType = 'VIEW';
+    if (currentCommentView) {
+        deliveryType = currentCommentView == 'flat'?'BOOL':'VIEW';
+    }
     // Delete comment
     $('a.DeleteComment').popup({
+        okButtonText:'Delete',
+        cancelButtonText: 'Cancel',
         confirm: true,
-        confirmHeading: gdn.definition('ConfirmDeleteCommentHeading', 'Delete Comment'),
-        confirmText: gdn.definition('ConfirmDeleteCommentText', 'Are you sure you want to delete this comment?'),
+        confirmHtml:       '\
+  <div class="Overlay"> \
+    <div id="{popup.id}" class="Popup"> \
+      <div class="Border"> \
+        <div class="Body"> \
+          <div class="Content">\
+            <h1>Delete</h1>\
+            <form>\
+                <div>\
+                  <p class="P Message">Are you sure you want to delete this item?</p>\
+                  <div class="Buttons Buttons-Confirm"> \
+                    <input type="button" class="Button Cancel Close" value="Cancel" id="Form_Cancel"/> \
+                    <input type="button" class="Button Primary Okay Delete" value="Delete" /> \
+                  </div> \
+                  </div> \
+                </form> \
+           </div> \
+        </div> \
+      </div> \
+    </div> \
+  </div>',
+        confirmHeading: gdn.definition('ConfirmDeleteCommentHeading', 'Delete'),
+        confirmText: gdn.definition('ConfirmDeleteCommentText', 'Are you sure you want to delete this item?'),
         followConfirm: false,
-        deliveryType: gdn.urlQueryParam( $('a.DeleteComment').attr('href'), 'deliveryType'), //'VIEW' - threaded, 'BOOL' - flat
+        deliveryType: gdn.urlQueryParam( $('a.DeleteComment').attr('href'), 'deliveryType')?
+          gdn.urlQueryParam( $('a.DeleteComment').attr('href'), 'deliveryType'): deliveryType, //'VIEW' - threaded, 'BOOL' - flat
         afterConfirm: function(json, sender) {
             var row = $(sender).parents('li.ItemComment');
             if (json.ErrorMessage) {

vanilla/applications/vanilla/models/class.categorymodel.php

@@ -931,6 +931,10 @@ public static function checkPermission($category, $permission, $fullMatch = true
         }
 
         if($groupID && $groupID > 0) {
+           // FIX: https://github.com/topcoder-platform/forums/issues/587
+           if ($userID == 0) {
+               return false;
+           }
            $result = checkGroupPermission($userID, $groupID, $categoryID, $permissionCategoryID,  $permission, $fullMatch);
         } else {
            $result = PermissionModel::checkPermission($userPermissions,$permission, $fullMatch, 'Category', $permissionCategoryID)