Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release

Browse Source
This commit is contained in:
John Eskew
2015-09-16 16:23:52 -04:00
parent 684f901760 2b24d3dfb2
commit 6b12ec97cc
8 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/static/js/certificates/models/signatory.js
View File

@@ -54,11 +54,6 @@ function(_, str, Backbone, BackboneRelational, gettext) {
}
}
if(_.has(attrs, 'organization') && attrs.organization.length > 40) {
errors = _.extend({
'organization': gettext('Signatory organization should not be more than 40 characters long.')
}, errors);
}
if (errors !== null){
return errors;
}

4
cms/static/js/certificates/spec/views/certificate_editor_spec.js
View File

@@ -242,10 +242,6 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
inputSignatoryTitle: 'This is a certificate signatory title that has waaaaaaay more than 106 characters, in order to cause an exception.'
});
setValuesToInputs(this.view, {
inputSignatoryOrganization: 'New Signatory Organization longer than 40 characters'
});
this.view.$(SELECTORS.saveCertificateButton).click();
expect(this.view.$('.certificate-edit-error')).toHaveClass('is-shown');
});

4
cms/templates/js/signatory-editor.underscore
View File

@@ -27,8 +27,8 @@
</div>
<div class="input-wrap field text add-signatory-organization <% if(error && error.organization) { print('error'); } %>">
<label for="signatory-organization-<%= signatory_number %>"><%= gettext("Organization ") %></label>
<input id="signatory-organization-<%= signatory_number %>" class="collection-name-input input-text signatory-organization-input" name="signatory-organization" type="text" placeholder="<%= gettext("Organization of the signatory") %>" value="<%= organization %>" aria-describedby="signatory-organization-<%= signatory_number %>-tip" maxlength="40" />
<span id="signatory-organization-<%= signatory_number %>-tip" class="tip tip-stacked"><%= gettext("The organization that this signatory belongs to, as it should appear on certificates. Maximum 40 characters.") %></span>
<input id="signatory-organization-<%= signatory_number %>" class="collection-name-input input-text signatory-organization-input" name="signatory-organization" type="text" placeholder="<%= gettext("Organization of the signatory") %>" value="<%= organization %>" aria-describedby="signatory-organization-<%= signatory_number %>-tip" />
<span id="signatory-organization-<%= signatory_number %>-tip" class="tip tip-stacked"><%= gettext("The organization that this signatory belongs to, as it should appear on certificates.") %></span>
<% if(error && error.organization) { %>
<span class="message-error"><%= error.organization %></span>
<% } %>