MINOR Merge errors
This commit is contained in:
parent
832d410303
commit
25d0196b04
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
|
@ -183,13 +183,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.cms-edit-form .ss-gridfield .action-edit').entwine({
|
|
||||||
onclick: function(e) {
|
|
||||||
$('.cms-container').loadPanel(this.attr('href'), '', {selector: '.cms-edit-form'});
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}(jQuery));
|
}(jQuery));
|
|
@ -214,12 +214,12 @@ class GridFieldPopupForm_ItemRequest extends RequestHandler {
|
||||||
// WARNING: The arguments passed here are a little arbitrary. This API will need cleanup
|
// WARNING: The arguments passed here are a little arbitrary. This API will need cleanup
|
||||||
$this->record->getCMSFields($this->popupController, $this->popupFormName),
|
$this->record->getCMSFields($this->popupController, $this->popupFormName),
|
||||||
new FieldList(
|
new FieldList(
|
||||||
$saveAction = new FormAction('doSave', _t('GridFieldDetailsForm.Save', 'Save')),
|
FormAction::create('doSave', _t('GridFieldDetailsForm.Save', 'Save'))
|
||||||
$deleteAction = new FormAction('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
|
->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'),
|
||||||
|
FormAction::create('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
|
||||||
|
->setUseButtonTag(true)->addExtraClass('ss-ui-action-destructive')
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
$saveAction->addExtraClass('ss-ui-action-constructive');
|
|
||||||
$deleteAction->addExtraClass('ss-ui-action-destructive');
|
|
||||||
$form->loadDataFrom($this->record);
|
$form->loadDataFrom($this->record);
|
||||||
return $form;
|
return $form;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
<a class="edit-link" href="$Link">edit</a>
|
<a class="action edit-link" href="$Link">edit</a>
|
Loading…
Reference in New Issue