diff --git a/Controller/CoGrouperLiteWidgetsController.php b/Controller/CoGrouperLiteWidgetsController.php index 1ea93f0..bd6e92c 100644 --- a/Controller/CoGrouperLiteWidgetsController.php +++ b/Controller/CoGrouperLiteWidgetsController.php @@ -45,7 +45,7 @@ public function display($id) { $cfg = $this->CoGrouperLiteWidget->getConfig(); $this->set('pl_grouperlite_index_url', Router::url([ - 'plugin' => "grouper_lite", + 'plugin' => 'grouper_lite', 'controller' => 'grouper_groups', 'action' => 'index', 'co' => $this->cur_co['Co']['id'], diff --git a/View/CoGrouperLiteWidgets/display.ctp b/View/CoGrouperLiteWidgets/display.ctp index 4a9ad29..2ce6518 100644 --- a/View/CoGrouperLiteWidgets/display.ctp +++ b/View/CoGrouperLiteWidgets/display.ctp @@ -33,17 +33,15 @@ $this->extend('/GrouperGroups/base'); // Figure out the widget ID so we can overwrite the dashboard's widget div $divid = $vv_config['CoGrouperLiteWidget']['co_dashboard_widget_id']; -$plugin = filter_var($vv_codw['CoDashboardWidget']['plugin'], FILTER_SANITIZE_SPECIAL_CHARS); -$pl = Inflector::underscore($plugin); -$plcmodel = Inflector::pluralize($pl); +$pl = Inflector::underscore(filter_var($vv_codw['CoDashboardWidget']['plugin'], FILTER_SANITIZE_SPECIAL_CHARS)); $idsuffix = rand(); ?> -
+
@@ -124,7 +122,9 @@ $idsuffix = rand();
-

 

+

 

diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp index e4805a2..85df70d 100644 --- a/View/GrouperGroups/base.ctp +++ b/View/GrouperGroups/base.ctp @@ -20,13 +20,18 @@ print $this->Html->script('GrouperLiteWidget.autocomplete.grouperplugin') . PHP_ print $this->Html->css('GrouperLiteWidget.co-grouper-base') . PHP_EOL; print $this->Html->css('GrouperLiteWidget.co-grouper-plugin') . PHP_EOL; -$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), - [ - 'controller' => 'grouper_groups', - 'action' => 'groupmember' - ], - ['prepend' => true] -); +if(isset($this->viewVars['vv_coid'])) { + $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), + [ + 'plugin' => Inflector::underscore(filter_var($this->plugin, FILTER_SANITIZE_SPECIAL_CHARS)), + 'controller' => 'grouper_groups', + 'action' => 'groupmember', + 'co' => $this->viewVars['vv_coid'], + 'glid' => $this->viewVars['vv_config']['CoGrouperLiteWidget']['id'] + ], + ['prepend' => true] + ); +} ?> diff --git a/View/GrouperGroups/index.ctp b/View/GrouperGroups/index.ctp index 138e8a3..8cbfe08 100644 --- a/View/GrouperGroups/index.ctp +++ b/View/GrouperGroups/index.ctp @@ -1,10 +1,17 @@ -extend('/GrouperGroups/base'); ?> -Html->script('GrouperLiteWidget.vue-router.js') ?> -Html->addCrumb(_txt('pl.grouperlite.nav.memberships')); ?> +extend('/GrouperGroups/base'); + +// Add javascript +print $this->Html->script('GrouperLiteWidget.vue-router.js'); + +// Add Breadcrumb +$this->Html->addCrumb(_txt('pl.grouperlite.nav.memberships')); + +?>
- Html->image('GrouperLiteWidget.Grouper.jpg', array('class' => 'img-fluid mr-2', 'style' => 'height: 50px')); ?> + Html->image('GrouperLiteWidget.Grouper.jpg', ['class' => 'img-fluid mr-2', 'style' => 'height: 50px']) ?>

@@ -109,13 +116,12 @@ owner: "", manager: "", }, - columns: _txt('pl.grouperlite.table.name'), - 'role' => _txt('pl.grouperlite.table.role'), - 'description' => _txt('pl.grouperlite.table.description'), - 'status' => _txt('pl.grouperlite.table.status'), - 'action' => _txt('pl.grouperlite.table.action'), - ))) ?>, + columns: _txt('pl.grouperlite.table.name'), + 'role' => _txt('pl.grouperlite.table.role'), + 'description' => _txt('pl.grouperlite.table.description'), + 'status' => _txt('pl.grouperlite.table.status'), + 'action' => _txt('pl.grouperlite.table.action')], + JSON_THROW_ON_ERROR) ?>, }, api: { @@ -146,15 +152,6 @@ app.mount('#grouper-lite-widget'); - -
diff --git a/webroot/css/co-grouper-base.css b/webroot/css/co-grouper-base.css index 198212e..bf7bef2 100644 --- a/webroot/css/co-grouper-base.css +++ b/webroot/css/co-grouper-base.css @@ -127,6 +127,13 @@ max-width: 400px; } +.ui-autocomplete { + max-height: 240px; + overflow-y: auto; + overflow-x: hidden; + padding-right: 20px; +} + @keyframes fadeInHalf { from { opacity: 0.5; diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css index 9b1cebf..2175744 100644 --- a/webroot/css/co-grouper-plugin.css +++ b/webroot/css/co-grouper-plugin.css @@ -335,4 +335,4 @@ a.list-group-item-action:hover .fa { animation: 1.2s linear infinite both loading; background-color: var(--teal); display: inline-block; -} \ No newline at end of file +}