Merge branch 'development' into stage

ontoportal-lirmm · Dec 12, 2024 · b054ba6 · b054ba6
2 parents ea876d6 + afd56c0
commit b054ba6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
@@ -88,10 +88,11 @@
               = t('users.edit.last_name')
               %font{:color => "red"} *
             = text_field :user, :lastName, value: @user.lastName, class: "register-input-short"
-        %p.register-input-title
-          = t('users.edit.username')
-          %font{:color => "red"} *
-        = text_field :user, :username, value: @user.username, class: "register-input-long"
+        %div.hidden
+          %p.register-input-title
+            = t('users.edit.username')
+            %font{:color => "red"} *
+          = text_field :user, :username, value: @user.username, class: "register-input-long"
         %p.register-input-title
           = t('users.edit.email')
           %font{:color => "red"} *
@@ -129,4 +130,4 @@
       - unless params[:password].eql?("true")
         .change-password
           %a{:href => edit_user_path(@user.username, password: true)}
-            = t('users.edit.change_password')
+            = t('users.edit.change_password')
diff --git a/app/views/visits/index.html.haml b/app/views/visits/index.html.haml
@@ -1,7 +1,7 @@
 %div.px-3.py-3.pt-md-5.pb-md-4.text-center
-  %h1.display-4 
+  %h1.display-4
     = t('visits.ontology_visits')
-  %p.lead (#{@analytics.date.strftime("%B %Y")})
+  %p.lead (#{DateTime.now.prev_month.strftime("%B %Y")})
 
 %div.container.pb-3.pb-md-4
   %div.table-responsive