Merge pull request #84 from Internetrix/master

permissions fix and holder fix
unclecheese · May 30, 2017 · d8029a9 · d8029a9
2 parents 674e111 + b42065a
commit d8029a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/code/Dashboard.php b/code/Dashboard.php
@@ -190,7 +190,7 @@ public function setdefault(SS_HTTPRequest $r) {
 	 * @return SS_HTTPResponse
 	 */
 	public function applytoall(SS_HTTPRequest $r) {
-		$members = Permission::get_members_by_permission("CMS_ACCESS_Dashboard");
+		$members = Permission::get_members_by_permission(array("CMS_ACCESS_Dashboard","ADMIN"));
 		foreach($members as $member) {
 			if($member->ID == Member::currentUserID()) continue;
 

diff --git a/templates/forms/DashboardButtonOptionsField_holder.ss b/templates/forms/DashboardButtonOptionsField_holder.ss
@@ -0,0 +1,12 @@
+<div id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>">
+
+<div id="$ID" class="dashboard-button-options-btn-group $Size" data-toggle="buttons-radio">
+	<a class="<% if isChecked %>active<% end_if %> first" data-value="small" data-name="$Name" title="Small"></a>
+	<a class="<% if isChecked %>active<% end_if %> middle" data-value="normal" data-name="$Name" title="Medium"></a>
+	<a class="<% if isChecked %>active<% end_if %> last" data-value="large" data-name="$Name" title="Large"></a>
+	<input type="hidden" name="$Name" value="$Value" />
+</div>
+	<% if $RightTitle %><label class="right">$RightTitle</label><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
+</div>