Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #131 from glogiotatidis/744853-monthly-report-editor

Mark form fields as safe. Should be reverted when playdoh's patch gets fixed. Fix bug 744853.
  • Loading branch information...
commit 899c795fa5bb28e021a212f536e293d0685623ee 2 parents eed77bf + ae17f72
@glogiotatidis glogiotatidis authored
View
52 remo/profiles/templates/profiles_edit.html
@@ -32,7 +32,7 @@
<div class="required-field"></div>
{% if profileform.display_name.errors %}
<small class="error">
- {{ profileform.display_name.errors }}
+ {{ profileform.display_name.errors|safe }}
</small>
{% endif %}
<p class="more-info">changing your username will result in
@@ -43,7 +43,7 @@
<div class="required-field"></div>
{% if userform.last_name.errors %}
<small class="error">
- {{ userform.last_name.errors }}
+ {{ userform.last_name.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="First name" name="first_name"
@@ -52,7 +52,7 @@
<div class="required-field"></div>
{% if userform.first_name.errors %}
<small class="error">
- {{ userform.first_name.errors }}
+ {{ userform.first_name.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Name in local language"
@@ -60,13 +60,13 @@
class="input-text big">
{% if profileform.local_name.errors %}
<small class="error">
- {{ profileform.local_name.errors }}
+ {{ profileform.local_name.errors|safe }}
</small>
{% endif %}
- {{ profileform.gender }}
+ {{ profileform.gender|safe }}
{% if profileform.gender.errors %}
<small class="error">
- {{ profileform.gender.errors }}
+ {{ profileform.gender.errors|safe }}
</small>
{% endif %}
</div>
@@ -105,7 +105,7 @@
<div class="required-field"></div>
{% if profileform.private_email.errors %}
<small class="error">
- {{ profileform.private_email.errors }}
+ {{ profileform.private_email.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Bugzilla email"
@@ -114,7 +114,7 @@
<div class="required-field"></div>
{% if userform.email.errors %}
<small class="error">
- {{ userform.email.errors }}
+ {{ userform.email.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Mozillians.org profile"
@@ -123,7 +123,7 @@
<div class="required-field"></div>
{% if profileform.mozillians_profile_url.errors %}
<small class="error">
- {{ profileform.mozillians_profile_url.errors }}
+ {{ profileform.mozillians_profile_url.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Wiki profile"
@@ -132,10 +132,10 @@
<div class="required-field"></div>
{% if profileform.wiki_profile_url.errors %}
<small class="error">
- {{ profileform.wiki_profile_url.errors }}
+ {{ profileform.wiki_profile_url.errors|safe }}
</small>
{% endif %}
- {{ profileform.mentor }}
+ {{ profileform.mentor|safe }}
</div>
</div>
</div>
@@ -150,7 +150,7 @@
<div class="required-field"></div>
{% if profileform.city.errors %}
<small class="error">
- {{ profileform.city.errors }}
+ {{ profileform.city.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="State or Region"
@@ -159,7 +159,7 @@
<div class="required-field"></div>
{% if profileform.region.errors %}
<small class="error">
- {{ profileform.region.errors }}
+ {{ profileform.region.errors|safe }}
</small>
{% endif %}
<select name="country">
@@ -175,7 +175,7 @@
</select>
{% if profileform.country.errors %}
<small class="error">
- {{ profileform.country.errors }}
+ {{ profileform.country.errors|safe }}
</small>
{% endif %}
<input type="hidden" placeholder="Latitude"
@@ -210,7 +210,7 @@
name="twitter_account" class="input-text big">
{% if profileform.twitter_account.errors %}
<small class="error">
- {{ profileform.twitter_account.errors }}
+ {{ profileform.twitter_account.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Facebook profile"
@@ -218,7 +218,7 @@
name="facebook_url" class="input-text big">
{% if profileform.facebook_url.errors %}
<small class="error">
- {{ profileform.facebook_url.errors }}
+ {{ profileform.facebook_url.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Diaspora profile"
@@ -226,7 +226,7 @@
name="diaspora_url" class="input-text big">
{% if profileform.diaspora_url.errors %}
<small class="error">
- {{ profileform.diaspora_url.errors }}
+ {{ profileform.diaspora_url.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="LinkedIn profile"
@@ -234,7 +234,7 @@
name="linkedin_url" class="input-text big">
{% if profileform.linkedin_url.errors %}
<small class="error">
- {{ profileform.linkedin_url.errors }}
+ {{ profileform.linkedin_url.errors|safe }}
</small>
{% endif %}
</div>
@@ -251,7 +251,7 @@
name="jabber_id" class="input-text big">
{% if profileform.jabber_id.errors %}
<small class="error">
- {{ profileform.jabber_id.errors }}
+ {{ profileform.jabber_id.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="IRC nickname"
@@ -260,14 +260,14 @@
<div class="required-field"></div>
{% if profileform.irc_name.errors %}
<small class="error">
- {{ profileform.irc_name.errors }}
+ {{ profileform.irc_name.errors|safe }}
</small>
{% endif %}
<textarea class="flat" placeholder="Please list the channels you use in IRC"
name="irc_channels">{{ profileform.irc_channels.value() }}</textarea>
{% if profileform.irc_channels.errors %}
<small class="error">
- {{ profileform.irc_channels.errors }}
+ {{ profileform.irc_channels.errors|safe }}
</small>
{% endif %}
</div>
@@ -286,7 +286,7 @@
name="personal_website_url" class="input-text big">
{% if profileform.personal_website_url.errors %}
<small class="error">
- {{ profileform.personal_website_url.errors }}
+ {{ profileform.personal_website_url.errors|safe }}
</small>
{% endif %}
<input type="text" placeholder="Feed for Reps Planet"
@@ -294,7 +294,7 @@
name="personal_blog_feed" class="input-text big">
{% if profileform.personal_blog_feed.errors %}
<small class="error">
- {{ profileform.personal_blog_feed.errors }}
+ {{ profileform.personal_blog_feed.errors|safe }}
</small>
{% endif %}
</div>
@@ -311,7 +311,7 @@
name="bio">{{ profileform.bio.value() }}</textarea>
{% if profileform.bio.errors %}
<small class="error">
- {{ profileform.bio.errors }}
+ {{ profileform.bio.errors|safe }}
</small>
{% endif %}
</div>
@@ -341,10 +341,10 @@
</div>
<div class="eleven columns edit-profile-item">
Date Rep joined program<br/><br/>
- {{ datejoinedform.date_joined_program }}
+ {{ datejoinedform.date_joined_program|safe }}
{% if datejoinedform.date_joined_program.errors %}
<small class="error">
- {{ datejoinedform.date_joined_program.errors }}
+ {{ datejoinedform.date_joined_program.errors|safe }}
</small>
{% endif %}
</div>
View
44 remo/reports/templates/edit_report.html
@@ -43,7 +43,7 @@
<p>All Mozillians are super busy and sometimes you need to
take a break from Mozilla awesomeness and you'll find
yourself with little or even no information to share in a given
- month. That's OK! If you feel that this is the month, skip the
+ month. That's OK! If you feel that this is the month, skip the
fields and click directly 'Save report'</p>
<p>In any doubt, please contact your mentor.</p>
</div>
@@ -64,14 +64,14 @@
name="past_items">{{ report_form.past_items.value() }}</textarea>
{% if report_form.past_items.errors %}
<small class="error">
- {{ report_form.past_items.errors }}
+ {{ report_form.past_items.errors|safe }}
</small>
{% endif %}
<textarea class="flat" placeholder="Future plans summary"
name="future_items">{{ report_form.future_items.value() }}</textarea>
{% if report_form.future_items.errors %}
<small class="error">
- {{ report_form.future_items.errors }}
+ {{ report_form.future_items.errors|safe }}
</small>
{% endif %}
</div>
@@ -90,7 +90,7 @@
name="recruits_comments">{{ report_form.recruits_comments.value() }}</textarea>
{% if report_form.recruits_comments.errors %}
<small class="error">
- {{ report_form.recruits_comments.errors }}
+ {{ report_form.recruits_comments.errors|safe }}
</small>
{% endif %}
</div>
@@ -104,7 +104,7 @@
name="flags">{{ report_form.flags.value() }}</textarea>
{% if report_form.flags.errors %}
<small class="error">
- {{ report_form.flags.errors }}
+ {{ report_form.flags.errors|safe }}
</small>
{% endif %}
</div>
@@ -117,8 +117,8 @@
<div class="six columns" >
<div id="eventformset">
{% for form in report_event_formset %}
- {{ form.id }}
- {{ form.report }}
+ {{ form.id|safe }}
+ {{ form.report|safe }}
<div class="row report-box {% if loop.last %} eventblock {% endif %}"
id="{{ form.prefix }}-row" >
<div class="one columns pictogram">
@@ -132,14 +132,14 @@
class="input-text big">
{% if form.name.errors %}
<small class="error">
- {{ form.name.errors }}
+ {{ form.name.errors|safe }}
</small>
{% endif %}
- {{ form.participation_type }}
+ {{ form.participation_type|safe }}
{% if form.participation_type.errors %}
<small class="error">
- {{ form.participation_type.errors }}
+ {{ form.participation_type.errors|safe }}
</small>
{% endif %}
@@ -147,7 +147,7 @@
name="{{ form.description.html_name }}">{{ form.description.value() }}</textarea>
{% if form.description.errors %}
<small class="error">
- {{ form.description.errors }}
+ {{ form.description.errors|safe }}
</small>
{% endif %}
@@ -156,11 +156,11 @@
class="input-text big">
{% if form.link.errors %}
<small class="error">
- {{ form.link.errors }}
+ {{ form.link.errors|safe }}
</small>
{% endif %}
- {{ form.DELETE }} Delete event
+ {{ form.DELETE|safe }} Delete event
</div>
</div>
</div>
@@ -172,15 +172,15 @@
</a>
</div>
</div>
- {{ report_event_formset.management_form }}
+ {{ report_event_formset.management_form|safe }}
</div>
<!-- Activities and Links -->
<div class="six columns">
<div id="linkformset">
{% for form in report_link_formset %}
- {{ form.id }}
- {{ form.report }}
+ {{ form.id|safe }}
+ {{ form.report|safe }}
<div class="row report-box {% if loop.last %} linkblock {% endif %}">
<div class="one columns pictogram">
a
@@ -193,7 +193,7 @@
class="input-text big">
{% if form.link.errors %}
<small class="error">
- {{ form.link.errors }}
+ {{ form.link.errors|safe }}
</small>
{% endif %}
@@ -202,11 +202,11 @@
name="{{ form.description.html_name }}">{{ form.description.value() }}</textarea>
{% if form.description.errors %}
<small class="error">
- {{ form.description.errors }}
+ {{ form.description.errors|safe }}
</small>
{% endif %}
- {{ form.DELETE }} Delete activity
+ {{ form.DELETE|safe }} Delete activity
</div>
</div>
</div>
@@ -218,7 +218,7 @@
</div>
</div>
- {{ report_link_formset.management_form }}
+ {{ report_link_formset.management_form|safe }}
</div>
<div class="row">
@@ -234,9 +234,9 @@
</div>
<div class="eleven columns">
<br/>
- {{ report_form.overdue }} Overdue report
+ {{ report_form.overdue|safe }} Overdue report
<br/>
- {{ report_form.empty }} Empty report
+ {{ report_form.empty|safe }} Empty report
{% if (not created) and (perms.reports.can_delete_reports) %}
<div class="align-right">
Please sign in to comment.
Something went wrong with that request. Please try again.