File tree Expand file tree Collapse file tree 6 files changed +7
-10
lines changed Expand file tree Collapse file tree 6 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ public function getHeaderText()
2929 return Mage::helper ('zendesk ' )->__ ('Please Select User to Add ' );
3030 }
3131
32- public function getButtonsHtml ()
32+ public function getButtonsHtml ($ area = null )
3333 {
3434 $ addButtonData = array (
3535 'label ' => Mage::helper ('zendesk ' )->__ ('Select User ' ),
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ public function getHeaderText()
2929 return Mage::helper ('zendesk ' )->__ ('Please Select Order to Add ' );
3030 }
3131
32- public function getButtonsHtml ()
32+ public function getButtonsHtml ($ area = null )
3333 {
3434 $ addButtonData = array (
3535 'label ' => Mage::helper ('zendesk ' )->__ ('Select Order ' ),
Original file line number Diff line number Diff line change 1919class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Email extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
2020
2121 public function render (Varien_Object $ row ) {
22- $ users = Mage::registry ('zendesk_users ' );
22+ $ users = Mage::registry ('zendesk_users ' ) ? Mage:: registry ( ' zendesk_users ' ) : array () ;
2323 $ value = (int ) $ row ->getData ($ this ->getColumn ()->getIndex ());
2424
2525 $ found = array_filter ($ users , function ($ user ) use ($ value ) {
Original file line number Diff line number Diff line change 1919class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
2020
2121 public function render (Varien_Object $ row ) {
22- $ users = Mage::registry ('zendesk_users ' );
22+ $ users = Mage::registry ('zendesk_users ' ) ? Mage:: registry ( ' zendesk_users ' ) : array () ;
2323 $ value = (int ) $ row ->getData ($ this ->getColumn ()->getIndex ());
2424
2525 $ found = array_filter ($ users , function ($ user ) use ($ value ) {
Original file line number Diff line number Diff line change 1717
1818class Zendesk_Zendesk_Model_Api_Requesters extends Zendesk_Zendesk_Model_Api_Users
1919{
20- public function create ($ email , $ name )
20+ public function create ($ email , $ name = null )
2121 {
2222 if (!Zend_Validate::is ($ email , 'EmailAddress ' )) {
2323 throw new InvalidArgumentException ('Invalid email address provided ' );
Original file line number Diff line number Diff line change @@ -132,9 +132,7 @@ public function getCollection(array $params = array()) {
132132
133133 public function getCollectionFromView ($ viewId , array $ params = array ()) {
134134 $ view = Mage::getModel ('zendesk/api_views ' )->execute ($ viewId , $ params );
135-
136- // Loop through the rows if the view is found and active
137- if (!empty ($ view )) {
135+ if (is_array ($ view ['rows ' ])) {
138136 foreach ($ view ['rows ' ] as $ row ) {
139137 $ ticket = array_merge ($ row , $ row ['ticket ' ]);
140138
@@ -144,10 +142,9 @@ public function getCollectionFromView($viewId, array $params = array()) {
144142 $ obj ->setData ($ ticket );
145143 $ this ->addItem ($ obj );
146144 }
147-
148- $ this ->_viewColumns = $ view ['columns ' ];
149145 }
150146
147+ $ this ->_viewColumns = $ view ['columns ' ] ? $ view ['columns ' ] : array ();
151148
152149 $ this ->setPageSize ($ params ['per_page ' ]);
153150 $ this ->setCurPage ($ params ['page ' ]);
You can’t perform that action at this time.
0 commit comments