StaticGen update Bash

Update zh-cn.yaml (#194)

Address #184

build assets

Update zh-cn.yaml (#194)


Former-commit-id: 4572f93371647c0a6b53cc375ec5bb00356a37c9 [formerly e58e4793ac0ca6915b605d7b2a8a77f0aec31172] [formerly 43635f6b98f546ec0e2656d26031388aef63a902 [formerly da4fd84002f4cac1d4e04f65c96237a553203d83]]
Former-commit-id: 15422887ad29dea63bdf861d9da8f8d28b4fbc8f [formerly 3949ffa499cf999c3f4b50ee18802c0f87a23807]
Former-commit-id: fac5ceeee3fa969239d9ef5e04ef5542a61d2761

assets/src/views/GlobalSettings.vue

@@ -15,17 +15,15 @@
 
     <h1>{{ $t('settings.globalSettings') }}</h1>
 
-    <form @submit="savePlugin" v-if="plugins.length > 0">
-      <template v-for="plugin in plugins">
-        <h2>{{ capitalize(plugin.name) }}</h2>
+    <form @submit="saveStaticGen" v-if="$store.state.staticGen.length > 0">
+      <h2>{{ capitalize($store.state.staticGen) }}</h2>
 
-        <p v-for="field in plugin.fields" :key="field.variable">
-          <label v-if="field.type !== 'checkbox'">{{ field.name }}</label>
-          <input v-if="field.type === 'text'" type="text" v-model.trim="field.value">
-          <input v-else-if="field.type === 'checkbox'" type="checkbox" v-model.trim="field.value">
-          <template v-if="field.type === 'checkbox'">{{ capitalize(field.name, 'caps') }}</template>
-        </p>
-      </template>
+      <p v-for="field in staticGen" :key="field.variable">
+        <label v-if="field.type !== 'checkbox'">{{ field.name }}</label>
+        <input v-if="field.type === 'text'" type="text" v-model.trim="field.value">
+        <input v-else-if="field.type === 'checkbox'" type="checkbox" v-model.trim="field.value">
+        <template v-if="field.type === 'checkbox'">{{ capitalize(field.name, 'caps') }}</template>
+      </p>
 
       <p><input type="submit" value="Save"></p>
     </form>
@@ -55,7 +53,7 @@ export default {
   data: function () {
     return {
       commands: [],
-      plugins: []
+      staticGen: []
     }
   },
   computed: {
@@ -64,8 +62,8 @@ export default {
   created () {
     getSettings()
       .then(settings => {
-        for (let key in settings.plugins) {
-          this.plugins.push(this.parsePlugin(key, settings.plugins[key]))
+        if (this.$store.state.staticGen.length > 0) {
+          this.parseStaticGen(settings.staticGen)
         }
 
         for (let key in settings.commands) {
@@ -108,40 +106,29 @@ export default {
         .then(() => { this.showSuccess(this.$t('settings.commandsUpdated')) })
         .catch(error => { this.showError(error) })
     },
-    savePlugin (event) {
+    saveStaticGen (event) {
       event.preventDefault()
-      let plugins = {}
+      let staticGen = {}
 
-      for (let plugin of this.plugins) {
-        let p = {}
+      for (let field of this.staticGen) {
+        staticGen[field.variable] = field.value
 
-        for (let field of plugin.fields) {
-          p[field.variable] = field.value
-
-          if (field.original === 'array') {
-            let val = field.value.split(' ')
-            if (val[0] === '') {
-              val.shift()
-            }
-
-            p[field.variable] = val
+        if (field.original === 'array') {
+          let val = field.value.split(' ')
+          if (val[0] === '') {
+            val.shift()
           }
-        }
 
-        plugins[plugin.name] = p
+          staticGen[field.variable] = val
+        }
       }
 
-      updateSettings(plugins, 'plugins')
-        .then(() => { this.showSuccess(this.$t('settings.pluginsUpdated')) })
+      updateSettings(staticGen, 'staticGen')
+        .then(() => { this.showSuccess(this.$t('settings.settingsUpdated')) })
         .catch(error => { this.showError(error) })
     },
-    parsePlugin (name, plugin) {
-      let obj = {
-        name: name,
-        fields: []
-      }
-
-      for (let option of plugin) {
+    parseStaticGen (staticgen) {
+      for (let option of staticgen) {
         let value = option.value
 
         let field = {
@@ -156,7 +143,7 @@ export default {
           field.original = 'array'
           field.value = value.join(' ')
 
-          obj.fields.push(field)
+          this.staticGen.push(field)
           continue
         }
 
@@ -167,10 +154,8 @@ export default {
             break
         }
 
-        obj.fields.push(field)
+        this.staticGen.push(field)
       }
-
-      return obj
     }
   }
 }

assets/src/views/User.vue

@@ -28,9 +28,7 @@
       <p><input type="checkbox" :disabled="admin" v-model="allowNew"> {{ $t('settings.allowNew') }}</p>
       <p><input type="checkbox" :disabled="admin" v-model="allowEdit"> {{ $t('settings.allowEdit') }}</p>
       <p><input type="checkbox" :disabled="admin" v-model="allowCommands"> {{ $t('settings.allowCommands') }}</p>
-      <p v-for="(value, key) in permissions" :key="key">
-        <input type="checkbox" :disabled="admin" v-model="permissions[key]"> {{ capitalize(key) }}
-      </p>
+      <p v-show="$store.state.staticGen.length"><input type="checkbox" :disabled="admin" v-model="allowPublish"> {{ $t('settings.allowPublish') }}</p>
 
       <h3>{{ $t('settings.userCommands') }}</h3>
       <p class="small">{{ $t('settings.userCommandsHelp') }} <i>git svn hg</i>.</p>
@@ -94,6 +92,7 @@ export default {
       allowNew: false,
       allowEdit: false,
       allowCommands: false,
+      allowPublish: false,
       permissions: {},
       password: '',
       username: '',
@@ -120,6 +119,7 @@ export default {
       this.allowCommands = true
       this.allowEdit = true
       this.allowNew = true
+      this.allowPublish = true
       for (let key in this.permissions) {
         this.permissions[key] = true
       }
@@ -140,6 +140,7 @@ export default {
         this.allowCommands = user.allowCommands
         this.allowNew = user.allowNew
         this.allowEdit = user.allowEdit
+        this.allowPublish = user.allowPublish
         this.filesystem = user.filesystem
         this.username = user.username
         this.commands = user.commands.join(' ')
@@ -183,6 +184,7 @@ export default {
       this.admin = false
       this.allowNew = false
       this.allowEdit = false
+      this.allowPublish = false
       this.permissins = {}
       this.allowCommands = false
       this.password = ''
@@ -241,6 +243,7 @@ export default {
         allowCommands: this.allowCommands,
         allowNew: this.allowNew,
         allowEdit: this.allowEdit,
+        allowPublish: this.allowPublish,
         permissions: this.permissions,
         css: this.css,
         locale: this.locale,