Merge remote-tracking branch 'upstream/develop' into develop

app/components/dashboard/dashboard_controller.js

@@ -115,6 +115,8 @@ angular.module('ulakbus.dashboard', [])
          * removes selected user
          */
         $scope.deselectUser = function () {
+            jQuery(".right-sidebar").css("width", "0px");
+            jQuery(".manager-view-inner").css("width", "");
             delete $scope.selectedUser;
             delete $scope.selectedMenuItems;
         };

app/shared/directives.js

@@ -357,10 +357,6 @@ angular.module('ulakbus')
                     $scope.selectedUser = data;
                 });
 
-                $scope.deselectUser = function () {
-                    delete $scope.selectedUser;
-                    delete $scope.selectedMenuItems;
-                };
 
                 // $scope.openSidebar = function () {
                 //     if ($window.innerWidth > '768') {

app/shared/templates/datefield.html

@@ -18,7 +18,7 @@
                id="{{form.key.slice(-1)[0]}}"
                ng-model-options="form.ngModelOptions"
                ng-model="$$value$$"
-               ng-disabled="form.is_disabled()"
+               readonly
                schema-validate="form"
                name="{{form.key.slice(-1)[0]}}"
                aria-describedby="{{form.key.slice(-1)[0] + 'Status'}}"

app/shared/templates/directives/header-notification.html

@@ -133,8 +133,8 @@
         <ul class="dropdown-menu dropdown-user">
             <li><a role="button"><i class="fa fa-user fa-fw"></i> Profil</a></li>
             <li class="divider"></li>
-            <li><a role="button"><i class="fa fa-gear fa-fw"></i> Ayarlar</a></li>
-            <li><a href="#/dev/settings"><i class="fa fa-gear fa-fw"></i> Ayarlar (Dev)</a></li>
+            <!--<li><a role="button"><i class="fa fa-gear fa-fw"></i> Ayarlar</a></li>-->
+            <li><a href="#/dev/settings"><i class="fa fa-gear fa-fw"></i> Ayarlar</a></li>
             <li class="divider"></li>
             <li><a ui-sref="login" href="javascript:void(0);" logout><i class="fa fa-sign-out fa-fw"></i> Çıkış</a></li>
         </ul>

app/zetalib/form_service.js

@@ -739,10 +739,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                                     return deferred.promise;
                                 }
                             },
-                            disabled: false,
-                            is_disabled: function () {
-                                return this.disabled;
-                            },
                             status: {opened: false},
                             open: function ($event) {
                                 this.disabled = true;
@@ -755,8 +751,8 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                             },
                             format: 'dd.MM.yyyy',
                             onSelect: function () {
-                                this.disabled = false;
                                 scope.model[k] = angular.copy(generator.dateformatter(scope.model[k]));
+                                return false;
                             }
                         };
                     }
@@ -984,7 +980,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
          */
         generator.dateformatter = function (formObject) {
             var ndate = new Date(formObject);
-            if (isNaN(ndate)) {
+            if (isNaN(ndate) || formObject === null) {
                 return '';
             } else {
                 var newdatearray = Moment(ndate).format('DD.MM.YYYY');