You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/10/02 23:30:28 UTC
[17/34] git commit: [#5015] Fixed issue with literal 'add_forum' in
field name
[#5015] Fixed issue with literal 'add_forum' in field name
New version of EasyWidgets is apparently overriding the passed-in
value of 'value' and, when not present, replacing it with a copy
of the widget.
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3b7ce7ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3b7ce7ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3b7ce7ed
Branch: refs/heads/db/4968
Commit: 3b7ce7ed3103ecd6058bb062573b6c8a1441a28c
Parents: 9184c47
Author: Cory Johns <jo...@geek.net>
Authored: Fri Sep 28 15:43:34 2012 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Fri Sep 28 17:18:16 2012 +0000
----------------------------------------------------------------------
.../templates/discussion_widgets/add_forum.html | 15 +++++++++------
.../templates/discussionforums/index.html | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3b7ce7ed/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
index e4ce5af..66c1bb9 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
@@ -1,26 +1,29 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% if value == c.add_forum -%}
+ {% set value = {} -%}
+{% endif -%}
<form method="{{method}}" action="{{action}}" enctype="multipart/form-data">
<input type="hidden" name="add_forum.app_id" value="{{app and app.config._id}}">
<div id="add_forum_form" style="display:none">
<label class="grid-5">Name:</label>
- <div class="grid-14"><input type="text" name="add_forum.name" value="{{value and value['name']}}"></div>
+ <div class="grid-14"><input type="text" name="add_forum.name" value="{{value['name']}}"></div>
<label class="grid-5">Short Name:</label>
- <div class="grid-14"><input type="text" name="add_forum.shortname" value="{{value and value['shortname']}}"></div>
+ <div class="grid-14"><input type="text" name="add_forum.shortname" value="{{value['shortname']}}"></div>
<label class="grid-5">Parent Forum:</label>
<div class="grid-14"><select name="add_forum.parent">
<option value="">None</option>
{% for f in app.forums %}<option value="{{f._id}}">{{h.really_unicode(f.name)}}</option>{% endfor %}
</select></div>
<label class="grid-5">Description:</label>
- <div class="grid-14"><textarea name="add_forum.description" style="height:50px;">{{value and value['description']}}</textarea></div>
+ <div class="grid-14"><textarea name="add_forum.description" style="height:50px;">{{value['description']}}</textarea></div>
<label class="grid-5">Monitoring Email:</label>
- <div class="grid-14"><input type="text" name="add_forum.monitoring_email" value="{{value and value['monitoring_email']}}"></div>
+ <div class="grid-14"><input type="text" name="add_forum.monitoring_email" value="{{value['monitoring_email']}}"></div>
<label class="grid-5">Icon:</label>
<div class="grid-14">{{lib.file_field('add_forum.icon', '')}}</div>
<label class="grid-5">Developer Only:</label>
- <div class="grid-14"><input name="add_forum.members_only" type="checkbox"{% if value and value['members_only'] %} checked{% endif %}></div>
+ <div class="grid-14"><input name="add_forum.members_only" type="checkbox"{% if value['members_only'] %} checked{% endif %}></div>
<label class="grid-5">Allow anonymous posts:</label>
- <div class="grid-14"><input name="add_forum.anon_posts" type="checkbox"{% if value and value['anon_posts'] %} checked{% endif %}></div>
+ <div class="grid-14"><input name="add_forum.anon_posts" type="checkbox"{% if value['anon_posts'] %} checked{% endif %}></div>
<label class="grid-5"> </label>
<div class="grid-14">
<input type="submit" name="create" value="Create Forum">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3b7ce7ed/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 859c12c..71a669d 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -11,7 +11,7 @@
{% if h.has_access(c.app, 'configure')() and (not hide_forum) %}
{% block edit_box %}
<div id="add_forum_form"{% if hide_forum %} style="display:none"{% endif %} class="editbox">
- {{c.add_forum.display(method='POST', action=c.project.url() + c.app.config.options.mount_point + '/add_forum_short', app=c.app, value=c.add_forum)}}
+ {{c.add_forum.display(method='POST', action=c.project.url() + c.app.config.options.mount_point + '/add_forum_short', app=c.app)}}
</div>
{% endblock %}
{% endif %}