[Sciret-svn] SF.net SVN: sciret: [484] branches/release-candidates/sciret-1.2

[<lu...@us...>]

Revision: 484
          http://sciret.svn.sourceforge.net/sciret/?rev=484&view=rev
Author:   lugo04
Date:     2007-08-15 12:31:40 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Add SF patch 1772600 from Trond Viggo H?\195?\165pnes

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/CHANGELOG
    branches/release-candidates/sciret-1.2/actions/SaveCategory.php
    branches/release-candidates/sciret-1.2/templates/EditCategory.tpl

Modified: branches/release-candidates/sciret-1.2/CHANGELOG
===================================================================
--- branches/release-candidates/sciret-1.2/CHANGELOG	2007-08-13 18:12:45 UTC (rev 483)
+++ branches/release-candidates/sciret-1.2/CHANGELOG	2007-08-15 19:31:40 UTC (rev 484)
@@ -1,3 +1,7 @@
+2007-08-15  Lucie Goga <lg...@th...>
+     * Add SF patch 1772600 from Trond Viggo Håpnes. This patch 
+       allows the admin to remove the icon from a (sub)category.
+
 2007-08-12  Alejandro Pedraza <ale...@gm...>
      * When an article was made to answer a question, show the 
        question text between the title and the article excerpt in 
@@ -40,7 +44,7 @@
        missing with xcache
 
 2007-07-18  Lucie Goga <lg...@th...>
-     * Scirt 1.1.0 release
+     * Sciret 1.1.0 release
 
 2007-07-15  Alejandro Pedraza <ale...@gm...>
      * [BUG] Fix problem to send mail from Sciret

Modified: branches/release-candidates/sciret-1.2/actions/SaveCategory.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/SaveCategory.php	2007-08-13 18:12:45 UTC (rev 483)
+++ branches/release-candidates/sciret-1.2/actions/SaveCategory.php	2007-08-15 19:31:40 UTC (rev 484)
@@ -26,9 +26,7 @@
         $category->setParentId($_POST['parentCategory']);
         $category->setLabel($_POST['name']);
         $category->setDescription($_POST['description']);
-        if ($_POST['icon'] != 'blank.gif') {
-            $category->setIconFileName($_POST['icon']);
-        }
+        $category->setIconFileName($_POST['icon']);
         $category->save();
 
         $_SESSION['message'] = $this->user->lang('Category saved successfully');

Modified: branches/release-candidates/sciret-1.2/templates/EditCategory.tpl
===================================================================
--- branches/release-candidates/sciret-1.2/templates/EditCategory.tpl	2007-08-13 18:12:45 UTC (rev 483)
+++ branches/release-candidates/sciret-1.2/templates/EditCategory.tpl	2007-08-15 19:31:40 UTC (rev 484)
@@ -45,7 +45,7 @@
             <td>[l]Icon[/l]:</td>
             <td>
                 <select name="icon" onchange="changeIcon(this.value)">
-                    <option value="blank.gif" >[l]None[/l]</option>
+                    <option value="" >[l]None[/l]</option>
                     <!-- BEGIN icons_block -->
                     <option value="{iconName}" {iconSelected}>{iconName}</option>
                     <!-- END icons_block -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.