Remove start of week setting

We will use the server setting
This commit is contained in:
Raimund Schlüßler 2018-09-23 17:05:47 +02:00
parent dadfcb173b
commit f2cb856aa6
No known key found for this signature in database
GPG key ID: 036FA7EB1A599178
2 changed files with 6 additions and 56 deletions

View file

@ -44,7 +44,6 @@ class SettingsService {
public function get() { public function get() {
$settings = array( $settings = array(
'showHidden' => (int)$this->settings->getUserValue($this->userId, $this->appName,'various_showHidden'), 'showHidden' => (int)$this->settings->getUserValue($this->userId, $this->appName,'various_showHidden'),
'startOfWeek' => (int)$this->settings->getUserValue($this->userId, $this->appName,'various_startOfWeek'),
'sortOrder' => (string)$this->settings->getUserValue($this->userId, $this->appName,'various_sortOrder'), 'sortOrder' => (string)$this->settings->getUserValue($this->userId, $this->appName,'various_sortOrder'),
'sortDirection' => (bool)$this->settings->getUserValue($this->userId, $this->appName,'various_sortDirection'), 'sortDirection' => (bool)$this->settings->getUserValue($this->userId, $this->appName,'various_sortDirection'),
'userID' => $this->userId 'userID' => $this->userId

View file

@ -28,16 +28,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div> </div>
<div id="app-settings-content"> <div id="app-settings-content">
<ul> <ul>
<li>
<label for="startOfWeek">{{ t('tasks', 'Start of week') }}</label>
<select id="startOfWeek" v-model="startOfWeek">
<option v-for="startOfWeekOption in startOfWeekOptions"
:value="startOfWeekOption.id"
:key="startOfWeekOption.id">
{{ startOfWeekOption.name }}
</option>
</select>
</li>
<li class="headline"> <li class="headline">
{{ t('tasks', 'Visibility of Smart Collections') }} {{ t('tasks', 'Visibility of Smart Collections') }}
</li> </li>
@ -85,54 +75,15 @@ export default {
id: 2, id: 2,
name: t('tasks', 'Automatic') name: t('tasks', 'Automatic')
} }
],
startOfWeekOptions: [
{
id: 0,
name: t('tasks', 'Sunday')
},
{
id: 1,
name: t('tasks', 'Monday')
},
{
id: 2,
name: t('tasks', 'Tuesday')
},
{
id: 3,
name: t('tasks', 'Wednesday')
},
{
id: 4,
name: t('tasks', 'Thursday')
},
{
id: 5,
name: t('tasks', 'Friday')
},
{
id: 6,
name: t('tasks', 'Saturday')
}
] ]
} }
}, },
computed: Object.assign({ computed: Object.assign({},
startOfWeek: { mapState({
get() { collections: state => state.collections,
return this.$store.state.settings.startOfWeek calendars: state => state.calendars,
}, dayOfMonth: state => state.dayOfMonth
set(value) { })
this.$store.dispatch('setSetting', { type: 'startOfWeek', value: value })
}
}
},
mapState({
collections: state => state.collections,
calendars: state => state.calendars,
dayOfMonth: state => state.dayOfMonth
})
), ),
methods: { methods: {
setVisibility: function(e, collectionID) { setVisibility: function(e, collectionID) {