@@ -52,14 +52,14 @@ |
||
| 52 | 52 | data: entries, |
| 53 | 53 | colNames: ["id", |
| 54 | 54 | <?php |
| 55 | - //index is needed for sorting |
|
| 56 | - echo "'index_name',"; |
|
| 57 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | - echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | - echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | - echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | - echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | - ?> |
|
| 55 | + //index is needed for sorting |
|
| 56 | + echo "'index_name',"; |
|
| 57 | + echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | + echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | + echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | + echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | + echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | + ?> |
|
| 63 | 63 | ], |
| 64 | 64 | colModel: [ |
| 65 | 65 | {name:'id',index:'id', hidden: true, key: true }, |
@@ -120,13 +120,13 @@ |
||
| 120 | 120 | $grid->set_option('loadonce', true) |
| 121 | 121 | ->set_option('grouping', true) |
| 122 | 122 | ->set_option('groupingView', [ |
| 123 | - 'groupField' => ['status'], |
|
| 124 | - 'groupColumnShow' => [false], |
|
| 125 | - 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | - 'groupOrder' => ['asc'], |
|
| 127 | - 'groupSummary' => [true], |
|
| 128 | - 'showSummaryOnHide' => true |
|
| 129 | - ]) |
|
| 123 | + 'groupField' => ['status'], |
|
| 124 | + 'groupColumnShow' => [false], |
|
| 125 | + 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | + 'groupOrder' => ['asc'], |
|
| 127 | + 'groupSummary' => [true], |
|
| 128 | + 'showSummaryOnHide' => true |
|
| 129 | + ]) |
|
| 130 | 130 | ->set_option('sortname', $sortname) |
| 131 | 131 | ->set_option('sortorder', $sortorder); |
| 132 | 132 | |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php echo $data['renderer']->block($data['form'], 'form_start'); ?> |
| 2 | 2 | <div class="maa_permissions_assignees"> |
| 3 | 3 | <?php |
| 4 | - if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | - echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 4 | + if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | + echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 6 | 6 | echo $data['renderer']->widget($data['form']->children['add_assignee']); |
| 7 | - } |
|
| 8 | - ?> |
|
| 7 | + } |
|
| 8 | + ?> |
|
| 9 | 9 | </div> |
| 10 | 10 | <table class="maa_permissions_items"> |
| 11 | 11 | <thead> |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | echo '<li' . ($link['selected'] ? ' class="selected"' : '') . '>'; |
| 9 | 9 | echo '<a href="' . $link['url'] . '/">' . $link['label'] . '</a></li>'; |
| 10 | 10 | } |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | </ul> |
| 13 | 13 | </div> |
| 14 | 14 | \ No newline at end of file |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | if ( !$this->can_do('midgard:update') |
| 219 | 219 | || !$this->can_do('midgard:parameters')) { |
| 220 | 220 | debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 221 | - MIDCOM_LOG_ERROR); |
|
| 221 | + MIDCOM_LOG_ERROR); |
|
| 222 | 222 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 223 | 223 | return false; |
| 224 | 224 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | if ( !$this->can_do('midgard:update') |
| 272 | 272 | || !$this->can_do('midgard:parameters')) { |
| 273 | 273 | debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 274 | - MIDCOM_LOG_ERROR); |
|
| 274 | + MIDCOM_LOG_ERROR); |
|
| 275 | 275 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 276 | 276 | return false; |
| 277 | 277 | } |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <div class="content-with-sidebar"> |
| 2 | 2 | <div class="main"> |
| 3 | 3 | <?php |
| 4 | - $data['view']->display_view(); |
|
| 4 | + $data['view']->display_view(); |
|
| 5 | 5 | $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX); |
| 6 | 6 | midcom::get()->dynamic_load($prefix . 'members/' . $data['group']->guid . '/'); |
| 7 | 7 | ?> |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | <div class="value"><?php echo $formatter->number($salesproject->profit); ?></div> |
| 41 | 41 | </div> |
| 42 | 42 | <?php |
| 43 | - $owner_card = org_openpsa_widgets_contact::get($salesproject->owner); |
|
| 43 | + $owner_card = org_openpsa_widgets_contact::get($salesproject->owner); |
|
| 44 | 44 | ?> |
| 45 | 45 | <div class="field"> |
| 46 | 46 | <div class="title"><?php echo $data['l10n']->get('owner'); ?></div> |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | echo '<span class="toolbar_label">' . $data['l10n_midcom']->get('delete') . '</span></a></li>'; |
| 27 | 27 | if ( midcom::get()->config->get('auth_allow_trusted') === true |
| 28 | 28 | && $data['person']->can_do('org.openpsa.user:su')) { |
| 29 | - echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n"; |
|
| 29 | + echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n"; |
|
| 30 | 30 | } |
| 31 | 31 | echo "</ul>\n"; |
| 32 | 32 | } |
@@ -37,7 +37,6 @@ |
||
| 37 | 37 | - 1: MIDCOM_PRIVILEGE_ALLOW |
| 38 | 38 | - 2: MIDCOM_PRIVILEGE_DENY |
| 39 | 39 | - 3: MIDCOM_PRIVILEGE_INHERIT |
| 40 | - |
|
| 41 | 40 | * @property string $guid |
| 42 | 41 | * @package midcom |
| 43 | 42 | */ |