svn: /pear2/BugManager/trunk/ src/BugManager/AttachmentContainer.php src/BugManager/CommentContainer.php src/BugManager/Issue.php www/pearworm/source/class/pearworm/model/Issue.js www/pearworm/source/class/pearworm/view/IssueEdit.js

cellog                                   Sat, 18 Sep 2010 19:59:24 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303525

Log:
display correct attachment count

Changed paths:
    U   pear2/BugManager/trunk/src/BugManager/AttachmentContainer.php
    U   pear2/BugManager/trunk/src/BugManager/CommentContainer.php
    U   pear2/BugManager/trunk/src/BugManager/Issue.php
    U   pear2/BugManager/trunk/www/pearworm/source/class/pearworm/model/Issue.js
    U   pear2/BugManager/trunk/www/pearworm/source/class/pearworm/view/IssueEdit.js

Modified: pear2/BugManager/trunk/src/BugManager/AttachmentContainer.php
===================================================================
--- pear2/BugManager/trunk/src/BugManager/AttachmentContainer.php	2010-09-18 19:41:05 UTC (rev 303524)
+++ pear2/BugManager/trunk/src/BugManager/AttachmentContainer.php	2010-09-18 19:59:24 UTC (rev 303525)
@@ -30,8 +30,10 @@

     function lazyLoad()
     {
-        $this->loaded = true;
-        $this->exchangeArray($this->parent->issuemanager->loadAttachments($this->parent));
-        $this->count = parent::count();
+        if (!$this->lazyLoaded()) {
+            $this->loaded = true;
+            $this->exchangeArray($this->parent->issuemanager->loadAttachments($this->parent));
+            $this->count = parent::count();
+        }
     }
 }

Modified: pear2/BugManager/trunk/src/BugManager/CommentContainer.php
===================================================================
--- pear2/BugManager/trunk/src/BugManager/CommentContainer.php	2010-09-18 19:41:05 UTC (rev 303524)
+++ pear2/BugManager/trunk/src/BugManager/CommentContainer.php	2010-09-18 19:59:24 UTC (rev 303525)
@@ -34,10 +34,7 @@
         if (!$this->lazyLoaded()) {
             $this->loaded = true;
             $this->exchangeArray($this->parent->issuemanager->loadComments($this->parent));
-        } else {
-            $this->exchangeArray(array_merge($this->getArrayCopy(),
-                                             $this->parent->issuemanager->loadComments($this->parent)));
+            $this->count = parent::count();
         }
-        $this->count = parent::count();
     }
 }

Modified: pear2/BugManager/trunk/src/BugManager/Issue.php
===================================================================
--- pear2/BugManager/trunk/src/BugManager/Issue.php	2010-09-18 19:41:05 UTC (rev 303524)
+++ pear2/BugManager/trunk/src/BugManager/Issue.php	2010-09-18 19:59:24 UTC (rev 303525)
@@ -127,8 +127,9 @@
         $ret['createtimestamp'] = $this->createtimestamp;
         $ret['startstamp'] = $this->createtimestamp->getTimestamp();
         $ret['modifiedtimestamp'] = $this->modifiedtimestamp;
+        $ret['attachmentcount'] = count($this->attachments);
         foreach ($ret as $name => $val) {
-            if ($name == 'startstamp') {
+            if ($name == 'startstamp' || $name == 'attachmentcount') {
                 continue;
             }
             $val = $this->$name;

Modified: pear2/BugManager/trunk/www/pearworm/source/class/pearworm/model/Issue.js
===================================================================
--- pear2/BugManager/trunk/www/pearworm/source/class/pearworm/model/Issue.js	2010-09-18 19:41:05 UTC (rev 303524)
+++ pear2/BugManager/trunk/www/pearworm/source/class/pearworm/model/Issue.js	2010-09-18 19:59:24 UTC (rev 303525)
@@ -117,6 +117,10 @@
       event: "changePhpversion",
       init: ""
     },
+    attachmentcount : {
+      event: "changeAttachmentcount",
+      init: 0
+    },
     ldesc : {
       event: "changeLdesc",
       init: ""
@@ -166,6 +170,7 @@
       this.setStatus(data.status);
       this.setCategory(data.category.primary);
       this.setAttachments(data.attachments);
+      this.setAttachmentcount(data.attachmentcount);
       this.setSecondarycategories(new qx.data.Array(data.category.secondary));
       var assigned = [];
       for (var i = 0; i < data.assigned.length; i++) {
@@ -292,6 +297,7 @@
       var data = qx.util.Serializer.toNativeObject(this);
       delete data.id;
       delete data.category;
+      delete data.attachmentcount;
       delete data.secondarycategories;
       delete data.description;
       delete data.newcomment;
@@ -332,6 +338,7 @@
       delete data.notpackagename;
       delete data.fake;
       delete data.fake2;
+      delete data.attachmentcount;
       delete data.startstamp;
       if (this.getId() == -1) {
         // reporting new issue

Modified: pear2/BugManager/trunk/www/pearworm/source/class/pearworm/view/IssueEdit.js
===================================================================
--- pear2/BugManager/trunk/www/pearworm/source/class/pearworm/view/IssueEdit.js	2010-09-18 19:41:05 UTC (rev 303524)
+++ pear2/BugManager/trunk/www/pearworm/source/class/pearworm/view/IssueEdit.js	2010-09-18 19:59:24 UTC (rev 303525)
@@ -358,7 +358,7 @@

       var choices = new qx.ui.tabview.TabView("top"),
           commentspage = new qx.ui.tabview.Page("Comments"),
-          patchespage = new qx.ui.tabview.Page("Attachments (" + this._issue.getAttachments().length + ")"),
+          patchespage = new qx.ui.tabview.Page("Attachments (" + this._issue.getAttachmentcount() + ")"),
           editpage = new qx.ui.tabview.Page("Edit"),
           addpatchpage = new qx.ui.tabview.Page("Add Attachment");