Permalink
Browse files

Remove a few superfluous parameters

  • Loading branch information...
flack committed Jan 9, 2018
1 parent 65e6824 commit b164e1c97655bf80be9dbdd4c97b8308a1d7d217
@@ -706,7 +706,7 @@ public function lock()
public function can_unlock()
{
return ( $this->__object->can_do('midcom:unlock')
|| midcom::get()->auth->can_user_do('midcom:unlock', null, 'midcom_services_auth', 'midcom'));
|| midcom::get()->auth->can_user_do('midcom:unlock', null, 'midcom_services_auth'));
}
/**
@@ -38,7 +38,7 @@ private function add_commands()
MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('midgard.admin.asgard', 'midgard.admin.asgard'),
MIDCOM_TOOLBAR_ICON => 'midgard.admin.asgard/asgard2-16.png',
MIDCOM_TOOLBAR_ACCESSKEY => 'a',
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin', 'midgard.admin.asgard'),
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin'),
];
if (midcom_connection::is_admin()) {
@@ -74,7 +74,7 @@ private function add_commands()
MIDCOM_TOOLBAR_URL => midcom_connection::get_url('self') . "__mfa/asgard/object/open/{$this->topic->guid}/",
MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('manage object', 'midgard.admin.asgard'),
MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/properties.png',
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin', 'midgard.admin.asgard') && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin'),
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin') && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin'),
];
}
$buttons = array_merge($buttons, $this->get_approval_controls($this->topic, false));
@@ -48,7 +48,7 @@ public function bind_object(midcom_core_dbaobject $object)
MIDCOM_TOOLBAR_URL => midcom_connection::get_url('self') . "__mfa/asgard/object/open/{$object->guid}/",
MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('manage object', 'midgard.admin.asgard'),
MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/properties.png',
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin', 'midgard.admin.asgard') && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin'),
MIDCOM_TOOLBAR_ENABLED => midcom::get()->auth->can_user_do('midgard.admin.asgard:access', null, 'midgard_admin_asgard_plugin') && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin'),
]
]);
}
@@ -85,7 +85,7 @@ private function _list_persons()
$qb->add_constraint($field, 'LIKE', "{$_REQUEST['midgard_admin_user_search']}%");
}
}
$qb->end_group('OR');
$qb->end_group();
$this->_persons = $qb->execute();
}
@@ -109,7 +109,7 @@ public function _handler_edit($handler_id, array $args, array &$data)
private function add_preview()
{
$parser = new net_nemein_wiki_parser($this->page);
$preview = $parser->get_html($this->controller->get_form_values()['content']);
$preview = $parser->get_html();
midcom::get()->head->add_jscript('var wikipage_preview = ' . json_encode(['content' => '<div class="wiki_preview">' . $preview . '</div>']));
midcom::get()->head->add_jquery_state_script('$("form.datamanager2 .form").prepend(wikipage_preview.content)');
@@ -116,7 +116,7 @@ public function render()
foreach ($this->_filters as $filter) {
echo '<div class="org_openpsa_filter_widget" id="' . $this->_identifier . '_' . $filter->name . '">';
$filter->render($url);
$filter->render();
echo "</div>\n";
}
echo "\n</form>\n";
@@ -75,7 +75,7 @@ public function _load_data($handler_id, array &$args, array &$data)
foreach ($qb_groups->execute() as $group) {
$qb->add_constraint('productGroup', '=', $group->id);
}
$qb->end_group('OR');
$qb->end_group();
}
}
$products = [];
@@ -134,7 +134,7 @@ public function _handler_list_prospects($handler_id, array $args, array &$data)
$qb->begin_group('OR');
$qb->add_constraint('orgOpenpsaObtype', '=', org_openpsa_projects_task_resource_dba::PROSPECT);
$qb->add_constraint('orgOpenpsaObtype', '=', org_openpsa_projects_task_resource_dba::RESOURCE);
$qb->end_group('OR');
$qb->end_group();
$qb->add_order('orgOpenpsaObtype');
$data['prospects'] = $qb->execute();

0 comments on commit b164e1c

Please sign in to comment.