Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Incorrect error message when post isn't long enough

This commit is contained in:
Robin Ward 2015-05-08 13:23:43 -04:00
parent 3830bb7d78
commit a93dfece70
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/popup-input-tip.js.es6
View File

@ -1,10 +1,12 @@
import StringBuffer from 'discourse/mixins/string-buffer';
import { iconHTML } from 'discourse/helpers/fa-icon';
export default Ember.Component.extend({
export default Ember.Component.extend(StringBuffer, {
classNameBindings: [':popup-tip', 'good', 'bad', 'shownAt::hide'],
animateAttribute: null,
bouncePixels: 6,
bounceDelay: 100,
rerenderTriggers: ['validation.reason'],
click() {
this.set('shownAt', false);
@ -32,7 +34,7 @@ export default Ember.Component.extend({
}
}.observes('shownAt'),
render(buffer) {
renderString(buffer) {
const reason = this.get('validation.reason');
if (!reason) { return; }

9
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -564,10 +564,11 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
replyValidation: function() {
const replyLength = this.get('model.replyLength'),
missingChars = this.get('model.missingReplyCharacters');
let reason;
if( replyLength < 1 ){
if (replyLength < 1) {
reason = I18n.t('composer.error.post_missing');
} else if( missingChars > 0 ) {
} else if (missingChars > 0) {
reason = I18n.t('composer.error.post_length', {min: this.get('model.minimumPostLength')});
let tl = Discourse.User.currentProp("trust_level");
if (tl === 0 || tl === 1) {
@ -575,8 +576,8 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
}
}
if( reason ) {
return Discourse.InputValidation.create({ failed: true, reason: reason });
if (reason) {
return Discourse.InputValidation.create({ failed: true, reason });
}
}.property('model.reply', 'model.replyLength', 'model.missingReplyCharacters', 'model.minimumPostLength'),