Pokaż
Ignoruj:
Data:
2009-09-30 15:49:14 (17 years ago)
Autor:
marek
Opis:

re #195 - merged with latest trunk

Lokalizacja:
branches/Emisje
Pliki:
7 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Emisje

    • Property svn:mergeinfo

      •  

        old new  
         1/branches/AutoShopper:815-818 
        12/branches/ReklamaReorganizacja:568-731 
        2 /trunk:774-810 
         3/tags/BazaReklam_1.1.28:831 
         4/trunk:774-837 

  • branches/Emisje/Wierszowki/Wierszowki.Model/Linq/LinqRepository.cs

    r752 r838  
    125125        public void Delete(T entity) 
    126126        { 
    127             using (var dc = new WierszowkiDataContext()) 
     127            if (entity != null) 
    128128            { 
    129                 dc.GetTable<T>().Attach(entity); 
    130                 dc.GetTable<T>().DeleteOnSubmit(entity); 
    131                 dc.SubmitChanges(); 
     129                _dataContext.GetTable<T>().DeleteOnSubmit(entity); 
     130                _dataContext.SubmitChanges(); 
    132131            } 
    133132        } 

  • branches/Emisje/Wierszowki/Wierszowki.Model/Linq/User.cs

    r752 r838  
    88    public partial class User : UserValidation, IIdentifiable 
    99    { 
     10        public string FullName { get { return FirstName + " " + LastName; } } 
    1011    } 
    1112} 

  • branches/Emisje/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs

    r752 r838  
    6060        public IQueryable<Issue> FindIssuesByMagazineId(int magazineId) 
    6161        { 
    62             var startDate = DateTime.Now.AddMonths(-1); 
     62            var startDate = DateTime.Now.AddMonths(-3); 
    6363            var endDate = DateTime.Now.AddMonths(1); 
    6464 

  • branches/Emisje/Wierszowki/Wierszowki.Model/Properties/Settings.Designer.cs

    r752 r838  
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 
    2828        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] 
    29         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;U" + 
    30             "ser ID=wwwadmin;Password=adm1648;")] 
     29        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User " + 
     30            "ID=sa;Password=POLzax;")] 
    3131        public string WierszowkiConnectionString { 
    3232            get { 

  • branches/Emisje/Wierszowki/Wierszowki.Model/Properties/Settings.settings

    r752 r838  
    66      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt; 
    77&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt; 
    8   &lt;ConnectionString&gt;Data Source=sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648;&lt;/ConnectionString&gt; 
     8  &lt;ConnectionString&gt;Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;&lt;/ConnectionString&gt; 
    99  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt; 
    1010&lt;/SerializableConnectionString&gt;</DesignTimeValue> 
    11       <Value Profile="(Default)">Data Source=sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648;</Value> 
     11      <Value Profile="(Default)">Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;</Value> 
    1212    </Setting> 
    1313  </Settings> 

  • branches/Emisje/Wierszowki/Wierszowki.Model/app.config

    r752 r838  
    55    <connectionStrings> 
    66        <add name="Wierszowki.Core.Properties.Settings.WierszowkiConnectionString" 
    7             connectionString="Data Source=sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648;" 
     7            connectionString="Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;" 
    88            providerName="System.Data.SqlClient" /> 
    99    </connectionStrings>