Indicate default quota

Fixes #11393
nextcloud · Oct 27, 2018 · 7978fb8 · 7978fb8
1 parent 37782b1
commit 7978fb8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.htaccess b/.htaccess
@@ -80,3 +80,7 @@ Options -Indexes
 <IfModule pagespeed_module>
   ModPagespeed Off
 </IfModule>
+#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
+
+ErrorDocument 403 /server/
+ErrorDocument 404 /server/
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
@@ -100,8 +100,7 @@ OC.MimeTypeList={
     "text/x-ldif": "text/code",
     "text/x-python": "text/code",
     "text/x-shellscript": "text/code",
-    "web": "text/code",
-    "application/internet-shortcut": "link"
+    "web": "text/code"
 },
 	files: [
     "application",

diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue
@@ -143,7 +143,7 @@ import Vue from 'vue';
 
 export default {
 	name: 'userList',
-	props: ['users', 'showConfig', 'selectedGroup', 'externalActions'],
+	props: ['users', 'showConfig', 'selectedGroup', 'externalActions', 'defaultQuotaValue'],
 	components: {
 		userRow,
 		Multiselect,
@@ -241,7 +241,10 @@ export default {
 			let quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({id: cur, label: cur}), []);
 			// add default presets
 			quotaPreset.unshift(this.unlimitedQuota);
-			quotaPreset.unshift(this.defaultQuota);
+
+			let defaultQuota = quotaPreset.find(quota => quota.id === this.defaultQuotaValue.id);
+			defaultQuota.label += " (default)";
+
 			return quotaPreset;
 		},
 		minPasswordLength() {

diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue
@@ -52,7 +52,7 @@
 				</div>
 			</template>
 		</app-navigation>
-		<user-list :users="users" :showConfig="showConfig" :selectedGroup="selectedGroup" :externalActions="externalActions" />
+		<user-list :users="users" :showConfig="showConfig" :selectedGroup="selectedGroup" :externalActions="externalActions" :defaultQuotaValue="defaultQuota"/>
 	</div>
 </template>