From: <jon...@us...> - 2013-10-28 14:22:41
|
Revision: 48194 http://sourceforge.net/p/tikiwiki/code/48194 Author: jonnybradley Date: 2013-10-28 14:22:38 +0000 (Mon, 28 Oct 2013) Log Message: ----------- [FIX] areas: Empty areas list before updating areas so deleted categories/perspectives get removed from the list plus a few cosmetic fixes. Thanks marclaporte, hopefully addresses wish4826 Modified Paths: -------------- branches/12.x/admin/include_workspace.php branches/12.x/lib/perspective/binderlib.php branches/12.x/templates/admin/include_workspace.tpl Modified: branches/12.x/admin/include_workspace.php =================================================================== --- branches/12.x/admin/include_workspace.php 2013-10-28 12:23:34 UTC (rev 48193) +++ branches/12.x/admin/include_workspace.php 2013-10-28 14:22:38 UTC (rev 48194) @@ -31,13 +31,7 @@ // building overview $areas_table = $areaslib->table('tiki_areas'); - $conditions = array(); - // if count zero, table probably not up-to-date - if ($areas_table->fetchCount($conditions) == 0) { - $areaslib->update_areas(); - } - $result = $areas_table->fetchAll(array('categId', 'perspectives', 'exclusive', 'share_common', 'enabled'), $conditions); $areas = array(); $perspectives = array(); @@ -61,8 +55,6 @@ $areas[] = $area; } - $no_area = (count($areas)) ? 0 : 1; - $smarty->assign('no_area', $no_area); $smarty->assign_by_ref('areas', $areas); } \ No newline at end of file Modified: branches/12.x/lib/perspective/binderlib.php =================================================================== --- branches/12.x/lib/perspective/binderlib.php 2013-10-28 12:23:34 UTC (rev 48193) +++ branches/12.x/lib/perspective/binderlib.php 2013-10-28 14:22:38 UTC (rev 48194) @@ -121,6 +121,7 @@ function update_areas() { global $prefs; + $this->areas->deleteMultiple(); // empty areas table before rebuilding $areas = array(); $descendants = $this->get_category_descendants($prefs['areas_root']); if (is_array($descendants)) { @@ -140,12 +141,11 @@ foreach (array_filter($areas) as $key => $item) { // don't bother with categs with no perspectives $data = array(); - if (isset($_REQUEST['update_areas'])) { // update checkboxes from form + // update checkboxes from form + $data['enabled'] = !empty($_REQUEST['enabled'][$key]) ? 'y' : 'n'; + $data['exclusive'] = !empty($_REQUEST['exclusive'][$key]) ? 'y' : 'n'; + $data['share_common'] = !empty($_REQUEST['share_common'][$key]) ? 'y' : 'n'; - $data['enabled'] = !empty($_REQUEST['enabled'][$key]) ? 'y' : 'n'; - $data['exclusive'] = !empty($_REQUEST['exclusive'][$key]) ? 'y' : 'n'; - $data['share_common'] = !empty($_REQUEST['share_common'][$key]) ? 'y' : 'n'; - } $this->bind_area($key, $item, $data); } } else { Modified: branches/12.x/templates/admin/include_workspace.tpl =================================================================== --- branches/12.x/templates/admin/include_workspace.tpl 2013-10-28 12:23:34 UTC (rev 48193) +++ branches/12.x/templates/admin/include_workspace.tpl 2013-10-28 14:22:38 UTC (rev 48194) @@ -71,7 +71,7 @@ <th>{tr}Description{/tr}</th> </tr> {cycle values="odd,even" print=false} - {if $no_area eq '0'} + {if $areas|count} {foreach from=$areas item=area} <tr class="{cycle}{if $area.enabled neq 'y'} disabled{/if}"> <td><input type="checkbox" name="enabled[{$area.categId}]"{if $area.enabled eq 'y'} checked="checked"{/if} class="enabledChecks"></td> @@ -79,7 +79,7 @@ <td>{$area.categName}</td> <td> {foreach from=$area.perspectives item=persp} - <a href="tiki-edit_perspective.php?action=edit&id={$persp.perspectiveId}" title="{tr}Edit perspective{/tr} {$persp.name}">{$persp.name}</a>, + <a href="tiki-edit_perspective.php?action=edit&id={$persp.perspectiveId}" title="{tr}Edit perspective{/tr} {$persp.name}">{$persp.name}</a>{if not $persp@last},{/if} {/foreach} </td> <td><input type="checkbox" name="exclusive[{$area.categId}]"{if $area.exclusive eq 'y'} checked="checked"{/if}{if $area.enabled neq 'y'} disabled="disabled"{/if} class="otherChecks"></td> @@ -96,7 +96,7 @@ }); {/jq} {else} - <th class="{cycle}" colspan="4">{tr}No category found in area{/tr}</th> + <td class="{cycle}" colspan="7">{tr}No areas found. Click "Update Areas" to populate this list{/tr}</td> {/if} </table> </fieldset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |