Drop out the 'allow user override' checkbox on bit.ly admin panel until we find a good way to shove the user settings in. :)
This commit is contained in:
parent
cad4805516
commit
fbfd96dfb9
@ -93,10 +93,6 @@ class BitlyadminpanelAction extends AdminPanelAction
|
|||||||
'bitly' => array('default_login', 'default_apikey')
|
'bitly' => array('default_login', 'default_apikey')
|
||||||
);
|
);
|
||||||
|
|
||||||
static $booleans = array(
|
|
||||||
'bitly' => array('allow_override')
|
|
||||||
);
|
|
||||||
|
|
||||||
$values = array();
|
$values = array();
|
||||||
|
|
||||||
foreach ($settings as $section => $parts) {
|
foreach ($settings as $section => $parts) {
|
||||||
@ -106,13 +102,6 @@ class BitlyadminpanelAction extends AdminPanelAction
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($booleans as $section => $parts) {
|
|
||||||
foreach ($parts as $setting) {
|
|
||||||
$values[$section][$setting]
|
|
||||||
= ($this->boolean($setting)) ? 1 : 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This throws an exception on validation errors
|
// This throws an exception on validation errors
|
||||||
|
|
||||||
$this->validate($values);
|
$this->validate($values);
|
||||||
@ -129,12 +118,6 @@ class BitlyadminpanelAction extends AdminPanelAction
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($booleans as $section => $parts) {
|
|
||||||
foreach ($parts as $setting) {
|
|
||||||
Config::save($section, $setting, $values[$section][$setting]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$config->query('COMMIT');
|
$config->query('COMMIT');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@ -240,29 +223,6 @@ class BitlyAdminPanelForm extends AdminForm
|
|||||||
|
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
$this->out->elementEnd('fieldset');
|
$this->out->elementEnd('fieldset');
|
||||||
|
|
||||||
$this->out->elementStart(
|
|
||||||
'fieldset',
|
|
||||||
array('id' => 'settings_bitly-options')
|
|
||||||
);
|
|
||||||
$this->out->element('legend', null, _m('Options'));
|
|
||||||
|
|
||||||
$this->out->elementStart('ul', 'form_data');
|
|
||||||
|
|
||||||
$this->li();
|
|
||||||
|
|
||||||
$this->out->checkbox(
|
|
||||||
'allow_override', _m('Allow users to specify their own API key.'),
|
|
||||||
(bool) $this->value('bitly', 'allow_override'),
|
|
||||||
_m('If set, users will be able to specify their own bit.ly login and API key ' .
|
|
||||||
'to be used for shortening their links.'),
|
|
||||||
'true'
|
|
||||||
);
|
|
||||||
$this->unli();
|
|
||||||
|
|
||||||
$this->out->elementEnd('ul');
|
|
||||||
|
|
||||||
$this->out->elementEnd('fieldset');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user