From 3716b0537e11164f1a766a3b5afc3eb8c0ea2e44 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 4 Nov 2014 11:31:59 -0500
Subject: [PATCH] Fix usercomments to require login before posting comments.
Avoids/Fixes a nasty Lightbox redirect bug.
---
themes/bootstrap3/js/record.js | 20 ++-----------------
.../templates/RecordTab/usercomments.phtml | 10 ++++++++--
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index 5d895e699c3..8c955bea00d 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -114,28 +114,12 @@ function registerAjaxCommentRecord() {
if (response.status == 'OK') {
refreshCommentList(id, recordSource);
$(form).find('textarea[name="comment"]').val('');
- } else if (response.status == 'NEED_AUTH') {
- Lightbox.addCloseAction(function() {
- $.ajax({
- type: 'POST',
- url: url,
- data: data,
- dataType: 'json',
- success:function() {
- refreshCommentList(id, recordSource);
- $(form).find('textarea[name="comment"]').val('');
- }
- });
- });
- return Lightbox.get('Record', 'AddComment', data, data);
+ $(form).find('input[type="submit"]').button('loading');
} else {
- $('#modal').find('.modal-body').html(response.data+'!');
- $('#modal').find('.modal-header h3').html('Error!');
- $('#modal').modal('show');
+ Lightbox.displayError(response.data);
}
}
});
- $(form).find('input[type="submit"]').button('loading');
return false;
});
// Delete links
diff --git a/themes/bootstrap3/templates/RecordTab/usercomments.phtml b/themes/bootstrap3/templates/RecordTab/usercomments.phtml
index d5629c09c4b..f8d5c9d5f65 100644
--- a/themes/bootstrap3/templates/RecordTab/usercomments.phtml
+++ b/themes/bootstrap3/templates/RecordTab/usercomments.phtml
@@ -13,7 +13,13 @@
<strong><?=$this->transEsc("Your Comment")?></strong>
</div>
<div class="col-sm-9">
- <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/>
- <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
+ <? $user = $this->auth()->isLoggedIn() ?>
+ <? if($user): ?>
+ <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/>
+ <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
+ <? else: ?>
+ <textarea id="comment" name="comment" class="form-control" rows="3" disabled></textarea><br/>
+ <input class="btn btn-primary" type="submit" value="<?=$this->transEsc("You must be logged in first")?>" disabled/>
+ <? endif; ?>
</div>
</form>
--
GitLab