application/modules/spindle/models/Service/BugTracker.php application/modules/spindle/views/scripts/bug/add.ajax.phtml application/modules/spindle/views/scripts/bug/content/view.phtml public/api/spindle/bug/jsonrpc.php @@ -1,7 +1,7 @@ - Import bugapp into Spindle module - - Refactor User model - - authenticate() should validate via the form - - loginAction() of UserController should then only call authenticate() + - Create comment/comments objects + - Refactor url() usage + - Should use baseUrl() instead - Refactor views - Determine optimal UI for app - split BorderContainer (top and center) TODO @@ -53,7 +53,6 @@ class Bootstrap extends My_Application_Bootstrap_Base public function initHelpers() { Zend_Controller_Action_HelperBroker::addPrefix('My_Controller_Helper'); - Zend_Controller_Action_HelperBroker::getStaticHelper('ResourceLoader'); return $this; } application/Bootstrap.php @@ -31,8 +31,6 @@ class Spindle_Bootstrap extends My_Application_Bootstrap_Module public function initAutoloader() { $autoloader = $this->getResourceLoader(); - $helper = Zend_Controller_Action_HelperBroker::getStaticHelper('ResourceLoader'); - $helper->addResourceLoader('spindle', $autoloader); return $this; } application/modules/spindle/Bootstrap.php @@ -14,6 +14,10 @@ class Spindle_BugController extends Zend_Controller_Action public function preDispatch() { + $ac = $this->_helper->getHelper('AjaxContext'); + $ac->addActionContext('add', 'html'); + $ac->initContext($this->_getParam('format')); + $this->model = new Spindle_Model_BugTracker; $this->commentModel = new Spindle_Model_CommentManager; application/modules/spindle/controllers/BugController.php @@ -280,6 +280,24 @@ class Spindle_Model_BugTracker extends Spindle_Model_Model return $adapter->fetchPairs('select id, priority FROM priority_type'); } + public function save(array $info, $validator = null) + { + if (empty($info['reporter_id'])) { + $user = $this->getIdentity(); + if (isset($user->id)) { + $info['reporter_id'] = $user->id; + } + } + $form = $this->getBugForm(); + $form->addElement('hidden', 'reporter_id', array( + 'required' => true, + 'validators' => array( + 'Digits', + ), + )); + return parent::save($info, $validator); + } + /** * Fetch an individual bug by id * @@ -452,7 +470,7 @@ class Spindle_Model_BugTracker extends Spindle_Model_Model public function getBugForm() { if (null === $this->_form) { - $this->_form = new Spindle_Model_Form_Bug; + $this->_form = new Spindle_Model_Form_Bug(array('model' => $this)); } return $this->_form; } application/modules/spindle/models/BugTracker.php @@ -5,7 +5,9 @@ class Spindle_Model_BugTracker_Bug extends Spindle_Model_Result 'id', 'reporter_id', 'developer_id', + 'priority', 'priority_id', + 'issue_type', 'type_id', 'resolution_id', 'summary', application/modules/spindle/models/BugTracker/Bug.php @@ -1,13 +1,15 @@ <?php class Spindle_Model_Form_Bug extends Zend_Dojo_Form { + protected $_model; + public function init() { - $this->addPrefixPath('My_Form_Element', 'My/Form/Element/', 'element'); - $this->addPrefixPath('My_Form_Decorator', 'My/Form/Decorator/', 'decorator'); + $this->setName('bugform') + ->addPrefixPath('My_Form_Element', 'My/Form/Element/', 'element') + ->addPrefixPath('My_Form_Decorator', 'My/Form/Decorator/', 'decorator'); - $helper = Zend_Controller_Action_HelperBroker::getStaticHelper('ResourceLoader'); - $model = $helper->getModel('BugTracker'); + $model = $this->getModel(); $priorities = $model->getPriorities(); $types = $model->getTypes(); @@ -51,4 +53,18 @@ class Spindle_Model_Form_Bug extends Zend_Dojo_Form 'decorators' => array('ViewHelper'), )); } + + public function setModel($model) + { + $this->_model = $model; + return $this; + } + + public function getModel() + { + if (null === $this->_model) { + $this->setModel(new Spindle_Model_BugTracker()); + } + return $this->_model; + } } application/modules/spindle/models/Form/Bug.php @@ -1,13 +1,14 @@ <?php class Spindle_Model_Form_Register extends Zend_Dojo_Form { + protected $_model; + public function init() { $this->addPrefixPath('My_Form_Element', 'My/Form/Element/', 'element'); $this->addPrefixPath('My_Form_Decorator', 'My/Form/Decorator/', 'decorator'); - $helper = Zend_Controller_Action_HelperBroker::getStaticHelper('ResourceLoader'); - $user = $helper->getModel('UserManager'); // mainly ensure it's loaded, for validation' + $user = $this->getModel(); $this->addElementPrefixPath('Spindle_Model_Validate', dirname(__FILE__) . '/../Validate', 'validate'); @@ -78,4 +79,15 @@ class Spindle_Model_Form_Register extends Zend_Dojo_Form 'label' => 'Register', )); } + + public function setModel($model) + { + $this->_model = $model; + return $this; + } + + public function getModel() + { + return $this->_model; + } } application/modules/spindle/models/Form/Register.php @@ -183,7 +183,11 @@ abstract class Spindle_Model_Model implements Zend_Acl_Resource_Interface public function getIdentity() { if (null === $this->_identity) { - return 'guest'; + $auth = Zend_Auth::getInstance(); + if (!$auth->hasIdentity()) { + return 'guest'; + } + $this->setIdentity($auth->getIdentity()); } return $this->_identity; @@ -321,7 +325,6 @@ abstract class Spindle_Model_Model implements Zend_Acl_Resource_Interface $info = $info[$parent]; } - if (array_key_exists('id', $info)) { $id = $info['id']; unset($info['id']); @@ -331,7 +334,7 @@ abstract class Spindle_Model_Model implements Zend_Acl_Resource_Interface } } if (null === $row) { - $row = $table->createRow(); + $row = $table->createRow($info); $row->date_created = date('Y-m-d'); } application/modules/spindle/models/Model.php @@ -150,7 +150,7 @@ class Spindle_Model_Service_Pastebin protected function _getPastebin() { if (null === $this->_pastebin) { - $this->_pastebin = $this->_getResourceLoader()->getModel('pastebin'); + $this->_pastebin = new Spindle_Model_Pastebin(); } return $this->_pastebin; } application/modules/spindle/models/Service/Pastebin.php @@ -169,7 +169,7 @@ class Spindle_Model_UserManager extends Spindle_Model_Model public function getRegisterForm() { if (empty($this->_formRegister)) { - $this->_formRegister = new Spindle_Model_Form_Register; + $this->_formRegister = new Spindle_Model_Form_Register(array('model' => $this)); } return $this->_formRegister; } application/modules/spindle/models/UserManager.php @@ -4,6 +4,7 @@ class Spindle_Model_UserManager_User implements Zend_Auth_Adapter_Interface, Zend_Acl_Role_Interface { protected $_allowed = array( + 'id', 'username', 'password', 'email', application/modules/spindle/models/UserManager/User.php @@ -11,14 +11,5 @@ <textarea readonly="readonly"><?= $this->escape($this->bug->description) ?></textarea> <h3>Comments</h3> -<?= $this->comments($this->url( - array( - 'module' => 'spindle', - 'controller' => 'bug', - 'action' => 'view', - 'id' => $this->bug->id, - ), - 'default', - true -)) ?> +<?= $this->comments($this->baseUrl() . '/spindle/bug/view/' . $this->bug->id) ?> application/modules/spindle/views/scripts/bug/view.phtml @@ -14,5 +14,7 @@ RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d RewriteRule ^.*$ - [NC,L] RewriteRule ^list list.php [L,QSA] +RewriteRule ^jsonrpc jsonrpc.php [L] +RewriteRule ^content/jsonrpc jsonrpc.php [L] RewriteRule ^.*$ index.php [NC,L] public/api/spindle/bug/.htaccess @@ -12,7 +12,9 @@ $whitelist = array( '/content/all-grid.html', ); -if (!in_array($file, $whitelist)) { +if (!in_array($file, $whitelist) + && !preg_match('#^/content/(bug)-(\d+)\.html$#', $file, $matches) +) { header('HTTP/1.0 501 Not Implemented'); echo "<h1>501 - Not Implemented</h1>"; echo "<p>Page requested: " . htmlentities($file) . "</p>"; @@ -33,10 +35,11 @@ $view->baseUrl = Zend_Registry::get('baseUrl'); $view->model = $model; if (isset($matches) && $matches) { - $view->id = $matches[2]; + $view->bug = $model->fetchBug($matches[2]); switch ($matches[1]) { + case 'bug': default: - $viewScript = ''; + $viewScript = 'bug/content/view.phtml'; break; } } else { public/api/spindle/bug/index.php @@ -2,8 +2,16 @@ dojo.provide("bug._base"); (function(){ dojo.require("bug.layout.BugLayout"); + dojo.require("dijit.Dialog"); + dojo.require("dijit.form.ValidationTextBox"); + dojo.require("dijit.form.FilteringSelect"); + dojo.require("dijit.form.SimpleTextarea"); + dojo.require("dijit.form.Button"); + dojo.require("dijit.form.Form"); dojo.require("dojox.data.QueryReadStore"); dojo.require("dojox.grid.DataGrid"); + dojo.require("dojox.rpc.Service"); + dojo.require("dojox.rpc.JsonRPC"); bug.initLayout = function() { console.log("In bug.initLayout()"); @@ -17,4 +25,67 @@ dojo.provide("bug._base"); mainPane.resize(); dijit.byId("spindleNavMenuAccordion").selectChild(dijit.byId("spindleNavMenuBugs")); }; + + bug.newDialog = function() { + if (!bug._newDialog) { + bug._newDialog = new dijit.Dialog({ + title: "Submit new issue", + href: spindle.baseUrl + "/spindle/bug/add/format/html", + parseOnLoad: true, + refreshOnShow: false, + style: "height: 375px; width: 450px;", + onLoad: function() { + var bform = dojo.byId("bugform"); + spindle.prepareForm(bform); + dojo.connect(bform, "onsubmit", bug, "processNewBug"); + } + }); + dojo.body().appendChild(bug._newDialog.domNode); + } + bug._newDialog.startup(); + bug._newDialog.show(); + }; + + bug.processNewBug = function(e) { + e.preventDefault(); + + var bugDef = spindle.prepareFormElements(dojo.byId("bugform")); + + console.log(bugDef); + + var service = bug._getService(); + + if ("id" in bugDef) { + delete bugDef.id; + } + + service.add(bugDef).addCallback(function(result) { + if (!result.error && !result.success) { + var errors = [{ + label: "General Transport Error: ", + messages: ["A general error occurred; please try again later."], + }]; + spindle.createErrorDialog(errors); + return; + } else if (result.error) { + spindle.createErrorDialog(result.messages); + return; + } + + bug._newDialog.hide(); + var bugPane = dijit.byId("bugPane"); + bugPane.setHref("/api/spindle/bug/content/bug-" + result.success + ".html"); + bugPane.refresh(); + }); + }; + + bug._getService = function() { + if (!bug._service) { + bug._service = new dojox.rpc.Service( + spindle.baseUrl + "/api/spindle/bug/content/jsonrpc.smd", + { envelope:"JSON-RPC-2.0" } + ); + } + return bug._service; + }; })(); public/js-src/bug/_base.js @@ -88,7 +88,7 @@ dojo.provide("spindle._base"); var rform = dojo.byId("register"); spindle.prepareForm(rform); dojo.connect(rform, "onsubmit", spindle, "processRegisterForm"); - }, + } }); dojo.body().appendChild(spindle._loginDialog.domNode); } public/js-src/spindle/_base.js @@ -18,7 +18,8 @@ <div id="spindleNavMenuBugs" dojoType="dijit.layout.AccordionPane" title="Bugs"> <ul class="menu"> - <li><a onClick="spindle.layoutSwitch('bug');dijit.byId('bugListTabContainer').selectChild(dijit.byId('bugListOpen'));">Open Bugs</a></li> + <li><a onClick="bug.newDialog()">Submit New Issue</a></li> + <li><a onClick="spindle.layoutSwitch('bug');dijit.byId('bugListTabContainer').selectChild(dijit.byId('bugListOpen'));">Open s</a></li> <li><a onClick="spindle.layoutSwitch('bug');dijit.byId('bugListTabContainer').selectChild(dijit.byId('bugListResolved'));">Resolved Bugs</a></li> <li><a onClick="spindle.layoutSwitch('bug');dijit.byId('bugListTabContainer').selectChild(dijit.byId('bugListAll'));">All Bugs</a></li> </ul> public/js-src/spindle/templates/NavMenu.html 74d84b873959afdf4a96833ef81a752f3327ded8 Matthew Weier O'Phinney matthew@weierophinney.net http://github.com/weierophinney/pastebin/commit/18c927e4dd203415dfca2a8263a63db194aa6db1 18c927e4dd203415dfca2a8263a63db194aa6db1 2008-12-23T15:10:31-08:00 2008-12-23T15:10:31-08:00 New issue dialog, and relate services 4611a4b2d07cfad90c84b2f3967599401dddac3c Matthew Weier O'Phinney matthew@weierophinney.net