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()
29
29
return Mage::helper ('zendesk ' )->__ ('Please Select User to Add ' );
30
30
}
31
31
32
- public function getButtonsHtml ()
32
+ public function getButtonsHtml ($ area = null )
33
33
{
34
34
$ addButtonData = array (
35
35
'label ' => Mage::helper ('zendesk ' )->__ ('Select User ' ),
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ public function getHeaderText()
29
29
return Mage::helper ('zendesk ' )->__ ('Please Select Order to Add ' );
30
30
}
31
31
32
- public function getButtonsHtml ()
32
+ public function getButtonsHtml ($ area = null )
33
33
{
34
34
$ addButtonData = array (
35
35
'label ' => Mage::helper ('zendesk ' )->__ ('Select Order ' ),
Original file line number Diff line number Diff line change 19
19
class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Email extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
20
20
21
21
public function render (Varien_Object $ row ) {
22
- $ users = Mage::registry ('zendesk_users ' );
22
+ $ users = Mage::registry ('zendesk_users ' ) ? Mage:: registry ( ' zendesk_users ' ) : array () ;
23
23
$ value = (int ) $ row ->getData ($ this ->getColumn ()->getIndex ());
24
24
25
25
$ found = array_filter ($ users , function ($ user ) use ($ value ) {
Original file line number Diff line number Diff line change 19
19
class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
20
20
21
21
public function render (Varien_Object $ row ) {
22
- $ users = Mage::registry ('zendesk_users ' );
22
+ $ users = Mage::registry ('zendesk_users ' ) ? Mage:: registry ( ' zendesk_users ' ) : array () ;
23
23
$ value = (int ) $ row ->getData ($ this ->getColumn ()->getIndex ());
24
24
25
25
$ found = array_filter ($ users , function ($ user ) use ($ value ) {
Original file line number Diff line number Diff line change 17
17
18
18
class Zendesk_Zendesk_Model_Api_Requesters extends Zendesk_Zendesk_Model_Api_Users
19
19
{
20
- public function create ($ email , $ name )
20
+ public function create ($ email , $ name = null )
21
21
{
22
22
if (!Zend_Validate::is ($ email , 'EmailAddress ' )) {
23
23
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()) {
132
132
133
133
public function getCollectionFromView ($ viewId , array $ params = array ()) {
134
134
$ 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 ' ])) {
138
136
foreach ($ view ['rows ' ] as $ row ) {
139
137
$ ticket = array_merge ($ row , $ row ['ticket ' ]);
140
138
@@ -144,10 +142,9 @@ public function getCollectionFromView($viewId, array $params = array()) {
144
142
$ obj ->setData ($ ticket );
145
143
$ this ->addItem ($ obj );
146
144
}
147
-
148
- $ this ->_viewColumns = $ view ['columns ' ];
149
145
}
150
146
147
+ $ this ->_viewColumns = $ view ['columns ' ] ? $ view ['columns ' ] : array ();
151
148
152
149
$ this ->setPageSize ($ params ['per_page ' ]);
153
150
$ this ->setCurPage ($ params ['page ' ]);
You can’t perform that action at this time.
0 commit comments