Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[24031] branches/proposals/4.x

[Nyloth <ny...@ti...>]

Seems to be in trunk revision 24025...

Nyloth

2009/12/24  <ala...@us...>:
> Revision: 24031
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24031&view=rev
> Author:   alain_desilets
> Date:     2009-12-24 16:06:03 +0000 (Thu, 24 Dec 2009)
>
> Log Message:
> -----------
> - Fixed a problem with new term templates. When you create a new term starting with a term search with language set to 'any language', the new term did not get filled with a term template, even after the user specified the language for that new page.
>
> Modified Paths:
> --------------
>    branches/proposals/4.x/lib/multilingual/multilinguallib.php
>    branches/proposals/4.x/templates/tiki-listpages_content.tpl
>    branches/proposals/4.x/tiki-editpage.php
>    branches/proposals/4.x/tiki-listpages.php
>
> Modified: branches/proposals/4.x/lib/multilingual/multilinguallib.php
> ===================================================================
> --- branches/proposals/4.x/lib/multilingual/multilinguallib.php 2009-12-24 15:08:16 UTC (rev 24030)
> +++ branches/proposals/4.x/lib/multilingual/multilinguallib.php 2009-12-24 16:06:03 UTC (rev 24031)
> @@ -813,8 +813,8 @@
>
>        return $userLangsInfo;
>     }
> +
>
> -
>        function getTemplateIDInLanguage($section, $template_name, $language) {
>                global $tikilib;
>                $all_templates = $tikilib->list_templates($section, 0, -1, 'name_asc', '');
>
> Modified: branches/proposals/4.x/templates/tiki-listpages_content.tpl
> ===================================================================
> --- branches/proposals/4.x/templates/tiki-listpages_content.tpl 2009-12-24 15:08:16 UTC (rev 24030)
> +++ branches/proposals/4.x/templates/tiki-listpages_content.tpl 2009-12-24 16:06:03 UTC (rev 24031)
> @@ -371,7 +371,7 @@
>
>  {if $find and $tiki_p_edit eq 'y' and $pagefound eq 'n' and $alias_found eq 'n'}
>        <div class="navbar">
> -                {button _text="{tr}Create Page{/tr}: $find" href="tiki-editpage.php?page=$find&lang=$find_lang&templateId=$template_id" _title="{tr}Create{/tr}"}
> +                {button _text="{tr}Create Page{/tr}: $find" href="tiki-editpage.php?page=$find&lang=$find_lang&templateId=$template_id&template_name=$template_name" _title="{tr}Create{/tr}"}
>        </div>
>  {/if}
>  {if $checkboxes_on eq 'y'}
>
> Modified: branches/proposals/4.x/tiki-editpage.php
> ===================================================================
> --- branches/proposals/4.x/tiki-editpage.php    2009-12-24 15:08:16 UTC (rev 24030)
> +++ branches/proposals/4.x/tiki-editpage.php    2009-12-24 16:06:03 UTC (rev 24031)
> @@ -527,10 +527,19 @@
>                }
>        }
>  }
> -if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0 && !isset($_REQUEST['preview']) && !isset($_REQUEST['save'])) {
> -       $template_data = $tikilib->get_template($_REQUEST["templateId"]);
> +if ((isset($_REQUEST["template_name"]) || isset($_REQUEST["template_id"])) && !isset($_REQUEST['preview']) && !isset($_REQUEST['save'])) {
> +       global $templateslib; require_once 'lib/templates/templateslib.php';
> +       $templateLang = isset( $_REQUEST['lang'] ) ? $_REQUEST['lang'] : null;
> +
> +       if (isset($_REQUEST["template_id"]))  {
> +               $template_id = $_REQUEST["template_id"];
> +       } else {
> +               include_once ('lib/multilingual/multilinguallib.php');
> +               $template_id = $multilinguallib->getTemplateIDInLanguage('wiki', $_REQUEST["template_name"], $templateLang);
> +       }
> +       $template_data = $templateslib->get_template($template_id, $templateLang);
>        $_REQUEST["edit"] = $template_data["content"]."\n".$_REQUEST["edit"];
> -       $smarty->assign("templateId", $_REQUEST["templateId"]);
> +       $smarty->assign("templateId", $template_id);
>  }
>
>  if (isset($_REQUEST["categId"]) && $_REQUEST["categId"] > 0) {
>
> Modified: branches/proposals/4.x/tiki-listpages.php
> ===================================================================
> --- branches/proposals/4.x/tiki-listpages.php   2009-12-24 15:08:16 UTC (rev 24030)
> +++ branches/proposals/4.x/tiki-listpages.php   2009-12-24 16:06:03 UTC (rev 24031)
> @@ -9,14 +9,16 @@
>  require_once ('tiki-setup.php');
>  require_once ('lib/ajax/ajaxlib.php');
>  $auto_query_args = array('initial', 'maxRecords', 'sort_mode', 'find', 'lang', 'langOrphan', 'findfilter_orphan', 'categId', 'category', 'page_orphans', 'structure_orphans', 'exact_match', 'hits_link_to_all_languages', 'create_new_pages_using_template_name');
> -if ($prefs['feature_multilingual'] == 'y' && isset($_REQUEST['lang']) && isset($_REQUEST['create_new_pages_using_template_name'])) {
> +if ($prefs['feature_multilingual'] == 'y' && isset($_REQUEST['lang']) && isset($_REQUEST['term_srch'])) {
>        global $multilinguallib;
>        include_once ('lib/multilingual/multilinguallib.php');
>        if (isset($_REQUEST['term_srch'])) {
>                $multilinguallib->storeCurrentTermSearchLanguageInSession($_REQUEST['lang']);
>        }
> -       $template_id_for_new_pages = $multilinguallib->getTemplateIDInLanguage('wiki', $_REQUEST['create_new_pages_using_template_name'], $_REQUEST['lang']);
> -       $smarty->assign('template_id', $template_id_for_new_pages);
> +//     $template_id_for_new_pages = $multilinguallib->getTemplateIDInLanguage('wiki', $_REQUEST['create_new_pages_using_template_name'], $_REQUEST['lang']);
> +//     $smarty->assign('template_id', $template_id_for_new_pages);
> +
> +       $smarty->assign('template_name', $_REQUEST['create_new_pages_using_template_name']);
>  }
>
>  if (isset($_REQUEST['hits_link_to_all_languages']) && $_REQUEST['hits_link_to_all_languages'] == 'On') {
>
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> This SF.Net email is sponsored by the Verizon Developer Community
> Take advantage of Verizon's best-in-class app development support
> A streamlined, 14 day to market process makes app distribution fast and easy
> Join now and get one step closer to millions of Verizon customers
> http://p.sf.net/sfu/verizon-dev2dev
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>