# HG changeset patch # User cavaliet # Date 1319476084 -7200 # Node ID 81cc9274c20a14ed62ef6661ce5802c6f7a8d4f3 # Parent 5f038a505cd7ffa0e5393fa98d985b6ed160745f Update Tag alias. diff -r 5f038a505cd7 -r 81cc9274c20a Controller/WikiTagController.php --- a/Controller/WikiTagController.php Mon Oct 24 18:45:34 2011 +0200 +++ b/Controller/WikiTagController.php Mon Oct 24 19:08:04 2011 +0200 @@ -339,7 +339,6 @@ /** * - * @Route("/wtrwi") * TODO: Enter description here ... * TODO : implement */ @@ -358,8 +357,27 @@ */ public function updateTagAliasAction() { + $id_tag = $this->getRequest()->request->get('id'); + $alias = $this->getRequest()->request->get('value'); + // We get the Tag and update its category. + $em = $this->getDoctrine()->getEntityManager(); + $tag = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->find($id_tag); + $tag->setAlias($alias); + $em->flush(); + $id_doc = $this->getRequest()->request->get('wikitag_document_id'); - return $this->renderDocTags($id_doc); + if($id_doc && $id_doc!=""){ + // In case we changed the alias from the document view + return $this->renderDocTags($id_doc); + } + else{ + // In case we changed the alias from the tag list. + $num_page = $this->getRequest()->request->get('num_page'); + $nb_by_page = $this->getRequest()->request->get('nb_by_page'); + $sort = $this->getRequest()->request->get('sort'); + $searched = $this->getRequest()->request->get('searched'); + return $this->renderAllTags($num_page, $nb_by_page, $sort, $searched); + } } /** @@ -444,7 +462,6 @@ $searched = $ar[3]; $sort = $ar[4]; $reverse_sort = $ar[5]; - //$pagerfanta = $ar[6]; return $this->render('WikiTagBundle:WikiTag:TagListTable.html.twig', array('tags' => $tags, 'searched' => $searched, 'nb_by_page' => $nb_by_page, 'sort' => $sort, 'num_page' => $num_page, 'reverse_sort' => $reverse_sort)); diff -r 5f038a505cd7 -r 81cc9274c20a Resources/public/js/wikiTag.js --- a/Resources/public/js/wikiTag.js Mon Oct 24 18:45:34 2011 +0200 +++ b/Resources/public/js/wikiTag.js Mon Oct 24 19:08:04 2011 +0200 @@ -33,10 +33,10 @@ submitdata: { csrfmiddlewaretoken:global_csrf_token, wikitag_document_id:$('#wikitag_document_id').val(), - num_page:$('#num_page').val(), - nb_by_page:$('#nb_by_page').val(), - sort:$('#sort').val(), - searched:$('#searched_str').val() + num_page:(('num_page' in getUrlVars()) ? getUrlVars()['num_page'] : undefined), + nb_by_page:(('nb_by_page' in getUrlVars()) ? getUrlVars()['nb_by_page'] : undefined), + sort:((('sort' in getUrlVars()) && (typeof(getUrlVars()['sort'])=="string")) ? getUrlVars()['sort'] : undefined), + searched:(('searched' in getUrlVars()) ? getUrlVars()['searched'] : undefined) }, callback : function(value, settings) { $('#wikitag_table_container').html(value); @@ -89,10 +89,10 @@ submitdata: { csrfmiddlewaretoken:global_csrf_token, wikitag_document_id:$('#wikitag_document_id').val(), - num_page:$('#num_page').val(), - nb_by_page:$('#nb_by_page').val(), - sort:$('#sort').val(), - searched:$('#searched_str').val() + num_page:(('num_page' in getUrlVars()) ? getUrlVars()['num_page'] : undefined), + nb_by_page:(('nb_by_page' in getUrlVars()) ? getUrlVars()['nb_by_page'] : undefined), + sort:((('sort' in getUrlVars()) && (typeof(getUrlVars()['sort'])=="string")) ? getUrlVars()['sort'] : undefined), + searched:(('searched' in getUrlVars()) ? getUrlVars()['searched'] : undefined) }, callback : function(value, settings) { $('#wikitag_table_container').html(value); @@ -246,10 +246,10 @@ type: 'POST', data: {csrfmiddlewaretoken:global_csrf_token, wikitag_document_id:$('#wikitag_document_id').val(), - num_page:$('#num_page').val(), - nb_by_page:$('#nb_by_page').val(), - sort:$('#sort').val(), - searched:$('#searched_str').val(), + num_page:(('num_page' in getUrlVars()) ? getUrlVars()['num_page'] : undefined), + nb_by_page:(('nb_by_page' in getUrlVars()) ? getUrlVars()['nb_by_page'] : undefined), + sort:((('sort' in getUrlVars()) && (typeof(getUrlVars()['sort'])=="string")) ? getUrlVars()['sort'] : undefined), + searched:(('searched' in getUrlVars()) ? getUrlVars()['searched'] : undefined), tag_id:id_tag, activated:new_checked },