From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 2 Dec 2014 13:48:13 +0000 (+0100)
Subject: [FIX] links and threads
X-Git-Url: http://git.inspyration.org/?p=odoo%2Fodoo.git;a=commitdiff_plain;h=7ae48c1839178190b7a80f6cb6ce03e53a736d17

[FIX] links and threads
---

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index bc3a7bc..3a1397e 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -275,7 +275,6 @@ class WebsiteForum(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         if not request.session.uid:
             return login_redirect()
-
         post_tag_ids = forum._tag_to_write_vals(post.get('post_tags', ''))
         new_question = request.env['forum.post'].create({
             'forum_id': forum.id,
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index b30accc..af17c90 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -133,16 +133,14 @@
             if ($link.attr("value").search("^http(s?)://.*")) {
                 var $warning = $('<div class="alert alert-danger alert-dismissable" style="position:absolute; margin-top: -180px; margin-left: 90px;">'+
                     '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
-                    'Please enter valid URl.'+
+                    'Please enter valid URL. Example: http://www.odoo.com'+
                     '</div>');
                 $link.parent().append($warning);
-                $link.parent().find("button#btn_post_your_article")[0].disabled = true;
-                $link.parent().find("input[name='content']")[0].value = '';
+                $("button#btn_post_your_article")[0].disabled = true;
             } else {
                 openerp.jsonRpc("/forum/get_url_title", 'call', {'url': $link.attr("value")}).then(function (data) {
-                    $link.parent().find("input[name='content']")[0].value = data;
-                    $('button').prop('disabled', false);
-                    $('input').prop('readonly', false);
+                    $("input[name='post_name']")[0].value = data;
+                    $('button#btn_post_your_article').prop('disabled', false);
                 });
             }
         });
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index badbfe9..b2aabd3 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -208,7 +208,7 @@
         <div class="question-block">
             <div class="question-name">
                 <t t-if="question.post_type == 'link'">
-                    <a t-att-href="question.content_link" t-raw="question.name"/>
+                    <a t-att-href="question.content_link" t-raw="question.name" target="_blank"/>
                 </t>
                 <t t-if="question.post_type in ('question', 'discussion')">
                     <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
@@ -359,7 +359,7 @@
             If the community vote on your post, it will get traction by being promoted
             in the homepage.
         </p><p>
-            We keep a high level of quality in showcased posts, only 20% of the submited
+            We keep a high level of quality in showcased posts, around 20% of the submited
             posts will be featured.
         </p>
         <form t-attf-action="/forum/#{ slug(forum) }/new?post_type=link" method="post" role="form" class="tag_text form-horizontal">
@@ -367,14 +367,14 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="content_link">URL to Share</label>
                 <div class="col-sm-8">
-                    <input type="text" name="post_name" required="True" t-attf-value="#{post_name}"
+                    <input type="text" name="content_link" required="True" t-attf-value="#{post_name}"
                         class="form-control mb16 link_url" placeholder="e.g. https://www.odoo.com"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="post_name">Post Title</label>
                 <div class="col-sm-8">
-                    <input type="text" name="content" readonly="True" required="True" t-attf-value="#{content}"
+                    <input type="text" name="post_name" required="True" t-attf-value="#{content}"
                         class="form-control"/>
                 </div>
             </div>
@@ -382,12 +382,12 @@
                 <label class="col-sm-2 control-label" for="post_tags">Tags</label>
                 <div class="col-sm-8">
                     <input type="hidden" name="karma_retag" t-attf-value="#{forum.karma_retag}" id="karma_retag"/>
-                    <input type="text" name="post_tags" readonly="True" class="form-control js_select2"/>
+                    <input type="text" name="post_tags" class="form-control js_select2"/>
                 </div>
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-8">
-                    <button class="btn btn-primary" disabled="True" id="btn_post_your_article">Post Your Article</button>
+                    <button class="btn btn-primary" disabled="True" id="btn_post_your_article">Post</button>
                 </div>
             </div>
         </form>