Skip to content

feature-cfm31 post rebase fixes2 #264

Merged
merged 4 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/Lib/Traits/LayoutTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public function getLayout(string $action = ''): string
'add',
'view',
'edit' => 'iframe',
'deleted' => 'iframe',
default => 'default'
};
}
Expand Down
1 change: 1 addition & 0 deletions app/src/View/Helper/VueHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class VueHelper extends Helper {
'information' => [
'global.attributes.none',
'global.value.none',
'global.visit.link',
'record',
'report.for',
'value.copied'
Expand Down
1 change: 1 addition & 0 deletions app/templates/Petitions/resume.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

$action_args = [];
if(!empty($vv_cur_co) && $vv_user_roles['authuser']) {
$action_args['vv_attr_id'] = $vv_primary_link_obj->name;
if($vv_user_roles['co'] || $vv_user_roles['platform']) {
$action_args['vv_actions'][] = [
'order' => $this->Menu->getMenuOrder('Default'),
Expand Down
2 changes: 1 addition & 1 deletion app/templates/Standard/deleted.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<button
class="btn btn-primary cm-deleted-close-button"
onclick="window.parent.hideCmModal()">
<em class="material-icons" aria-hidden="true">cancel</em>
<em class="material-symbols-outlined" aria-hidden="true">cancel</em>
<?= __d('operation','close') ?>
</button>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export default {
return this.options.label;
}
// Otherwise return the default
return this.txt['autocomplete.people.label'];
return this.txt['operation.autocomplete.people.label'];
},
hasAutoCompleteLabel: function() {
// Check to see if a label has been passed in
Expand Down Expand Up @@ -312,7 +312,7 @@ export default {
<!-- XXX The input field will be updated with the option.label value. Here we only need the full name -->
<span class="cm-ac-name-value" v-if="slotProps.option.isMember" v-html="slotProps.option.fullName"></span>
<span class="cm-ac-name-value" v-else v-html="this.highlightedquery(slotProps.option.fullName, query)"></span>
<span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['GroupMembers'] }}</span>
<span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['controller.GroupMembers'] }}</span>
</div>
<div class="cm-ac-item-id">
ID: {{ slotProps.option.itemId }}
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/js/comanage/components/mvea/mvea-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export default {
<li class="field-data-container linked-row" v-if="this.core.mveaType == 'urls'" @click="followRowLink">
<div class="field-data force-wrap with-hover-button">
<a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.description != '' && this.mvea.description != null ? this.mvea.description : this.mvea.url }}</a>
<a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['global.visit.link']"><span class="material-symbols">north_east</span></a>
<a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['information.global.visit.link']"><span class="material-symbols">north_east</span></a>
<copy-value-button
:txt="this.txt"
:valueToCopy="this.mvea.url">
Expand Down